From a5999181fbc149b42c7c0a2cef8fecb346d3cd85 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 30 Oct 2023 10:26:32 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BB=A3=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); From 41c0aec1ad81dab2abbbd9d12d3720caf7bd3c47 Mon Sep 17 00:00:00 2001 From: "hongxi.lian" Date: Mon, 30 Oct 2023 15:22:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?workstation=E5=88=B0productscrapjob?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itembasic/ItembasicController.java | 2 - .../ProductscrapJobDetailController.java | 15 +++- .../ProductscrapJobMainController.java | 22 +++-- .../ProductscrapRecordDetailController.java | 15 +++- .../ProductscrapRecordMainController.java | 15 +++- .../ProductscrapRequestDetailController.java | 22 +++-- .../ProductscrapRequestMainController.java | 15 +++- .../controller/project/ProjectController.java | 15 +++- .../purchase/PurchaseDetailController.java | 15 +++- .../purchase/PurchaseMainController.java | 15 +++- .../PurchasePlanDetailController.java | 15 +++- .../PurchasePlanMainController.java | 15 +++- .../PurchaseclaimRecordDetailController.java | 15 +++- .../PurchaseclaimRecordMainController.java | 15 +++- .../PurchaseclaimRequestDetailController.java | 1 + .../PurchasepriceController.java | 23 +++++- .../PurchasereceiptJobDetailController.java | 15 +++- .../PurchasereceiptJobMainController.java | 15 +++- ...PurchasereceiptRecordDetailController.java | 16 +++- .../PurchasereceiptRecordMainController.java | 15 +++- ...urchasereceiptRequestDetailController.java | 15 +++- .../PurchasereceiptRequestMainController.java | 15 +++- .../PurchasereturnJobDetailController.java | 15 +++- .../PurchasereturnJobMainController.java | 20 ++++- .../vo/PurchasereturnJobDetailRespVO.java | 3 +- .../PurchasereturnRecordDetailController.java | 15 +++- .../PurchasereturnRecordMainController.java | 15 +++- ...PurchasereturnRequestDetailController.java | 16 +++- .../PurchasereturnRequestMainController.java | 14 ++++ .../PutawayJobDetailController.java | 15 +++- .../putawayJob/PutawayJobMainController.java | 15 +++- .../PutawayRecordDetailController.java | 15 +++- .../PutawayRecordMainController.java | 14 ++++ .../PutawayRequestDetailController.java | 16 +++- .../PutawayRequestMainController.java | 20 +++-- .../RecordsettingController.java | 27 +++++-- .../RepleinshJobDetailController.java | 15 ++++ .../RepleinshJobMainController.java | 19 ++++- .../RepleinshRecordDetailController.java | 16 +++- .../RepleinshRecordMainController.java | 14 ++++ .../RepleinshRequestDetailController.java | 16 +++- .../RepleinshRequestMainController.java | 15 +++- .../RequestsettingController.java | 31 ++++++- .../wms/controller/rule/RuleController.java | 15 ++++ .../wms/controller/rule/vo/RuleRespVO.java | 3 +- .../controller/sale/SaleDetailController.java | 16 +++- .../controller/sale/SaleMainController.java | 15 +++- .../saleprice/SalepriceController.java | 22 ++++- .../scrapJob/ScrapJobDetailController.java | 16 +++- .../scrapJob/ScrapJobMainController.java | 17 +++- .../ScrapRecordDetailController.java | 21 ++++- .../ScrapRecordMainController.java | 20 ++++- .../ScrapRequestDetailController.java | 28 +++++-- .../ScrapRequestMainController.java | 27 +++++-- .../wms/controller/shift/ShiftController.java | 23 +++++- .../stdcostprice/StdcostpriceController.java | 23 +++++- .../strategy/StrategyController.java | 16 +++- .../strategy/vo/StrategyRespVO.java | 2 + .../supplier/SupplierController.java | 25 +++++- ...SupplierdeliverRecordDetailController.java | 20 +++-- .../SupplierdeliverRecordMainController.java | 25 ++++-- ...upplierdeliverRequestDetailController.java | 15 ++++ .../SupplierdeliverRequestMainController.java | 20 +++-- ...SupplierinvoiceRecordDeatilController.java | 15 +++- .../SupplierinvoiceRecordMainController.java | 20 +++-- ...upplierinvoiceRequestDetailController.java | 15 +++- .../SupplierinvoiceRequestMainController.java | 15 +++- .../supplieritem/SupplieritemController.java | 29 ++++++- .../SystemcalendarController.java | 25 ++++-- .../wms/controller/team/TeamController.java | 20 ++++- .../transaction/TransactionController.java | 15 +++- .../transaction/vo/TransactionRespVO.java | 2 + .../TransactiontypeController.java | 25 +++++- .../TransferissueJobDetailController.java | 15 +++- .../TransferissueJobMainController.java | 15 +++- .../TransferissueRecordDetailController.java | 21 +++-- .../TransferissueRecordMainController.java | 21 ++++- .../TransferissueRequestDetailController.java | 19 ++++- .../TransferissueRequestMainController.java | 19 +++++ .../transferlog/TransferlogController.java | 14 ++++ .../transferlog/vo/TransferlogRespVO.java | 2 + .../TransferreceiptJobDetailController.java | 20 +++-- .../TransferreceiptJobMainController.java | 21 +++-- ...TransferreceiptRecordDetailController.java | 20 +++-- .../TransferreceiptRecordMainController.java | 16 +++- ...ransferreceiptRequestDetailController.java | 15 +++- .../TransferreceiptRequestMainController.java | 22 +++-- .../UnplannedissueJobDetailController.java | 14 ++++ .../UnplannedissueJobMainController.java | 15 +++- .../UnplannedissueRecordDetailController.java | 15 +++- .../UnplannedissueRecordMainController.java | 20 +++-- .../vo/UnplannedissueRecordMainBaseVO.java | 1 + .../vo/UnplannedissueRecordMainExcelVO.java | 1 + .../vo/UnplannedissueRecordMainRespVO.java | 3 + ...UnplannedissueRequestDetailController.java | 15 +++- .../UnplannedissueRequestMainController.java | 17 +++- .../UnplannedreceiptJobDetailController.java | 21 +++-- .../UnplannedreceiptJobMainController.java | 22 +++-- ...nplannedreceiptRecordDetailController.java | 21 +++-- .../UnplannedreceiptRecordMainController.java | 23 ++++-- ...plannedreceiptRequestDetailController.java | 20 +++-- ...UnplannedreceiptRequestMainController.java | 20 +++-- .../warehouse/WarehouseController.java | 27 +++++-- .../controller/work/WorkDetailController.java | 19 ++++- .../controller/work/WorkMainController.java | 21 +++-- .../workshop/WorkshopController.java | 24 +++++- .../workstation/WorkstationController.java | 28 ++++++- .../ProductscrapJobDetailMapper.java | 6 +- .../ProductscrapJobMainMapper.java | 6 +- .../ProductscrapRecordDetailMapper.java | 6 +- .../ProductscrapRecordMainMapper.java | 6 +- .../ProductscrapRequestDetailMapper.java | 6 +- .../ProductscrapRequestMainMapper.java | 6 ++ .../wms/dal/mysql/project/ProjectMapper.java | 6 +- .../mysql/purchase/PurchaseDetailMapper.java | 6 +- .../mysql/purchase/PurchaseMainMapper.java | 6 +- .../PurchasePlanDetailMapper.java | 6 +- .../purchasePlan/PurchasePlanMainMapper.java | 6 +- .../PurchaseclaimRecordDetailMapper.java | 6 +- .../PurchaseclaimRecordMainMapper.java | 6 +- .../purchaseprice/PurchasepriceMapper.java | 6 +- .../PurchasereceiptJobDetailMapper.java | 6 +- .../PurchasereceiptJobMainMapper.java | 6 +- .../PurchasereceiptRecordDetailMapper.java | 6 +- .../PurchasereceiptRecordMainMapper.java | 6 +- .../PurchasereceiptRequestDetailMapper.java | 6 +- .../PurchasereceiptRequestMainMapper.java | 6 +- .../PurchasereturnJobDetailMapper.java | 6 ++ .../PurchasereturnJobMainMapper.java | 6 +- .../PurchasereturnRecordDetailMapper.java | 6 +- .../PurchasereturnRecordMainMapper.java | 6 +- .../PurchasereturnRequestDetailMapper.java | 6 +- .../PurchasereturnRequestMainMapper.java | 7 +- .../putawayJob/PutawayJobDetailMapper.java | 6 +- .../putawayJob/PutawayJobMainMapper.java | 6 +- .../PutawayRecordDetailMapper.java | 6 +- .../PutawayRecordMainMapper.java | 5 ++ .../PutawayRequestDetailMapper.java | 6 +- .../PutawayRequestMainMapper.java | 6 +- .../recordsetting/RecordsettingMapper.java | 6 +- .../RepleinshJobDetailMapper.java | 6 +- .../repleinshJob/RepleinshJobMainMapper.java | 5 ++ .../RepleinshRecordDetailMapper.java | 6 +- .../RepleinshRecordMainMapper.java | 6 +- .../RepleinshRequestDetailMapper.java | 6 +- .../requestsetting/RequestsettingMapper.java | 6 +- .../module/wms/dal/mysql/rule/RuleMapper.java | 6 +- .../wms/dal/mysql/sale/SaleDetailMapper.java | 5 ++ .../wms/dal/mysql/sale/SaleMainMapper.java | 6 +- .../dal/mysql/saleprice/SalepriceMapper.java | 6 +- .../mysql/scrapJob/ScrapJobDetailMapper.java | 6 +- .../mysql/scrapJob/ScrapJobMainMapper.java | 5 ++ .../scrapRecord/ScrapRecordDetailMapper.java | 6 +- .../scrapRecord/ScrapRecordMainMapper.java | 6 +- .../ScrapRequestDetailMapper.java | 6 +- .../scrapRequest/ScrapRequestMainMapper.java | 6 +- .../wms/dal/mysql/shift/ShiftMapper.java | 7 +- .../stdcostprice/StdcostpriceMapper.java | 7 +- .../dal/mysql/strategy/StrategyMapper.java | 6 +- .../dal/mysql/supplier/SupplierMapper.java | 7 +- .../SupplierdeliverRecordDetailMapper.java | 6 +- .../SupplierdeliverRecordMainMapper.java | 6 +- .../SupplierdeliverRequestDetailMapper.java | 6 +- .../SupplierdeliverRequestMainMapper.java | 6 +- .../SupplierinvoiceRecordDeatilMapper.java | 6 +- .../SupplierinvoiceRecordMainMapper.java | 6 +- .../SupplierinvoiceRequestDetailMapper.java | 6 +- .../SupplierinvoiceRequestMainMapper.java | 6 +- .../supplieritem/SupplieritemMapper.java | 5 ++ .../systemcalendar/SystemcalendarMapper.java | 6 +- .../module/wms/dal/mysql/team/TeamMapper.java | 11 ++- .../mysql/transaction/TransactionMapper.java | 5 ++ .../TransactiontypeMapper.java | 7 +- .../TransferissueJobDetailMapper.java | 6 +- .../TransferissueJobMainMapper.java | 6 +- .../TransferissueRecordDetailMapper.java | 6 +- .../TransferissueRecordMainMapper.java | 6 +- .../TransferissueRequestDetailMapper.java | 6 ++ .../TransferissueRequestMainMapper.java | 5 ++ .../mysql/transferlog/TransferlogMapper.java | 6 ++ .../TransferreceiptJobDetailMapper.java | 6 ++ .../TransferreceiptJobMainMapper.java | 6 ++ .../TransferreceiptRecordDetailMapper.java | 6 ++ .../TransferreceiptRecordMainMapper.java | 7 ++ .../TransferreceiptRequestMainMapper.java | 6 ++ .../UnplannedissueJobDetailMapper.java | 6 ++ .../UnplannedissueJobMainMapper.java | 6 +- .../UnplannedissueRecordDetailMapper.java | 6 ++ .../UnplannedissueRecordMainMapper.java | 6 ++ .../UnplannedissueRequestDetailMapper.java | 6 ++ .../UnplannedissueRequestMainMapper.java | 6 ++ .../UnplannedreceiptJobDetailMapper.java | 7 ++ .../UnplannedreceiptJobMainMapper.java | 7 ++ .../UnplannedreceiptRecordDetailMapper.java | 6 ++ .../UnplannedreceiptRecordMainMapper.java | 6 ++ .../UnplannedreceiptRequestDetailMapper.java | 6 +- .../UnplannedreceiptRequestMainMapper.java | 6 ++ .../dal/mysql/warehouse/WarehouseMapper.java | 7 ++ .../wms/dal/mysql/work/WorkDetailMapper.java | 5 ++ .../wms/dal/mysql/work/WorkMainMapper.java | 7 ++ .../dal/mysql/workshop/WorkshopMapper.java | 8 +- .../mysql/workstation/WorkstationMapper.java | 8 ++ .../ProductscrapJobDetailService.java | 9 +++ .../ProductscrapJobDetailServiceImpl.java | 6 +- .../ProductscrapJobMainService.java | 9 +++ .../ProductscrapJobMainServiceImpl.java | 7 +- .../ProductscrapRecordDetailService.java | 9 +++ .../ProductscrapRecordDetailServiceImpl.java | 6 +- .../ProductscrapRecordMainService.java | 9 +++ .../ProductscrapRecordMainServiceImpl.java | 6 +- .../ProductscrapRequestDetailService.java | 9 +++ .../ProductscrapRequestDetailServiceImpl.java | 6 +- .../ProductscrapRequestMainService.java | 9 +++ .../ProductscrapRequestMainServiceImpl.java | 6 +- .../wms/service/project/ProjectService.java | 8 ++ .../service/project/ProjectServiceImpl.java | 6 +- .../purchase/PurchaseDetailService.java | 9 +++ .../purchase/PurchaseDetailServiceImpl.java | 6 +- .../service/purchase/PurchaseMainService.java | 9 +++ .../purchase/PurchaseMainServiceImpl.java | 6 +- .../PurchasePlanDetailService.java | 9 +++ .../PurchasePlanDetailServiceImpl.java | 5 ++ .../purchasePlan/PurchasePlanMainService.java | 9 ++- .../PurchasePlanMainServiceImpl.java | 5 ++ .../PurchaseclaimRecordDetailService.java | 9 +++ .../PurchaseclaimRecordDetailServiceImpl.java | 5 ++ .../PurchaseclaimRecordMainService.java | 9 +++ .../PurchaseclaimRecordMainServiceImpl.java | 5 ++ .../purchaseprice/PurchasepriceService.java | 10 +++ .../PurchasepriceServiceImpl.java | 72 ++++++++++++----- .../PurchasereceiptJobDetailService.java | 10 ++- .../PurchasereceiptJobDetailServiceImpl.java | 6 +- .../PurchasereceiptJobMainService.java | 11 ++- .../PurchasereceiptJobMainServiceImpl.java | 7 +- .../PurchasereceiptRecordDetailService.java | 9 ++- ...urchasereceiptRecordDetailServiceImpl.java | 6 +- .../PurchasereceiptRecordMainService.java | 8 ++ .../PurchasereceiptRecordMainServiceImpl.java | 6 +- .../PurchasereceiptRequestDetailService.java | 10 ++- ...rchasereceiptRequestDetailServiceImpl.java | 6 +- .../PurchasereceiptRequestMainService.java | 9 +++ ...PurchasereceiptRequestMainServiceImpl.java | 6 +- .../PurchasereturnJobDetailService.java | 9 +++ .../PurchasereturnJobDetailServiceImpl.java | 6 +- .../PurchasereturnJobMainService.java | 8 ++ .../PurchasereturnJobMainServiceImpl.java | 7 +- .../PurchasereturnRecordDetailService.java | 10 +++ ...PurchasereturnRecordDetailServiceImpl.java | 6 +- .../PurchasereturnRecordMainService.java | 9 +++ .../PurchasereturnRecordMainServiceImpl.java | 6 +- .../PurchasereturnRequestDetailService.java | 8 ++ ...urchasereturnRequestDetailServiceImpl.java | 6 ++ .../PurchasereturnRequestMainService.java | 9 ++- .../PurchasereturnRequestMainServiceImpl.java | 6 +- .../putawayJob/PutawayJobDetailService.java | 12 ++- .../PutawayJobDetailServiceImpl.java | 6 +- .../putawayJob/PutawayJobMainService.java | 9 +++ .../putawayJob/PutawayJobMainServiceImpl.java | 7 +- .../PutawayRecordDetailService.java | 9 ++- .../PutawayRecordDetailServiceImpl.java | 6 +- .../PutawayRecordMainService.java | 10 +++ .../PutawayRecordMainServiceImpl.java | 6 +- .../PutawayRequestDetailService.java | 8 ++ .../PutawayRequestDetailServiceImpl.java | 10 +-- .../PutawayRequestMainService.java | 11 ++- .../PutawayRequestMainServiceImpl.java | 5 ++ .../recordsetting/RecordsettingService.java | 9 +++ .../RecordsettingServiceImpl.java | 63 ++++++++++----- .../RepleinshJobDetailService.java | 8 ++ .../RepleinshJobDetailServiceImpl.java | 10 +-- .../repleinshJob/RepleinshJobMainService.java | 10 +++ .../RepleinshJobMainServiceImpl.java | 6 +- .../RepleinshRecordDetailService.java | 9 +++ .../RepleinshRecordDetailServiceImpl.java | 6 +- .../RepleinshRecordMainService.java | 8 ++ .../RepleinshRecordMainServiceImpl.java | 6 +- .../RepleinshRequestDetailService.java | 9 ++- .../RepleinshRequestDetailServiceImpl.java | 6 ++ .../RepleinshRequestMainService.java | 8 ++ .../requestsetting/RequestsettingService.java | 10 ++- .../RequestsettingServiceImpl.java | 81 ++++++++++++++----- .../module/wms/service/rule/RuleService.java | 8 ++ .../wms/service/rule/RuleServiceImpl.java | 6 ++ .../wms/service/sale/SaleDetailService.java | 9 ++- .../service/sale/SaleDetailServiceImpl.java | 7 ++ .../wms/service/sale/SaleMainService.java | 8 ++ .../wms/service/sale/SaleMainServiceImpl.java | 5 ++ .../service/saleprice/SalepriceService.java | 9 ++- .../saleprice/SalepriceServiceImpl.java | 71 +++++++++++----- .../scrapJob/ScrapJobDetailService.java | 8 ++ .../scrapJob/ScrapJobDetailServiceImpl.java | 6 +- .../service/scrapJob/ScrapJobMainService.java | 8 ++ .../scrapJob/ScrapJobMainServiceImpl.java | 7 +- .../scrapRecord/ScrapRecordDetailService.java | 9 +++ .../ScrapRecordDetailServiceImpl.java | 6 +- .../scrapRecord/ScrapRecordMainService.java | 8 ++ .../ScrapRecordMainServiceImpl.java | 6 ++ .../ScrapRequestDetailService.java | 10 ++- .../ScrapRequestDetailServiceImpl.java | 10 ++- .../scrapRequest/ScrapRequestMainService.java | 10 +++ .../ScrapRequestMainServiceImpl.java | 6 +- .../wms/service/shift/ShiftService.java | 9 ++- .../wms/service/shift/ShiftServiceImpl.java | 75 ++++++++++++----- .../stdcostprice/StdcostpriceService.java | 9 ++- .../stdcostprice/StdcostpriceServiceImpl.java | 69 ++++++++++++---- .../wms/service/strategy/StrategyService.java | 9 +++ .../service/strategy/StrategyServiceImpl.java | 6 ++ .../wms/service/supplier/SupplierService.java | 10 ++- .../service/supplier/SupplierServiceImpl.java | 56 +++++++++---- .../SupplierdeliverRecordDetailService.java | 11 ++- ...upplierdeliverRecordDetailServiceImpl.java | 7 +- .../SupplierdeliverRecordMainService.java | 8 ++ .../SupplierdeliverRecordMainServiceImpl.java | 6 +- .../SupplierdeliverRequestDetailService.java | 10 ++- ...pplierdeliverRequestDetailServiceImpl.java | 5 ++ .../SupplierdeliverRequestMainService.java | 8 ++ ...SupplierdeliverRequestMainServiceImpl.java | 6 +- .../SupplierinvoiceRecordDeatilService.java | 9 +++ ...upplierinvoiceRecordDeatilServiceImpl.java | 10 +-- .../SupplierinvoiceRecordMainService.java | 8 ++ .../SupplierinvoiceRecordMainServiceImpl.java | 6 +- .../SupplierinvoiceRequestDetailService.java | 8 ++ ...pplierinvoiceRequestDetailServiceImpl.java | 5 ++ .../SupplierinvoiceRequestMainService.java | 8 ++ ...SupplierinvoiceRequestMainServiceImpl.java | 5 ++ .../supplieritem/SupplieritemService.java | 9 +++ .../supplieritem/SupplieritemServiceImpl.java | 45 +++++++++-- .../systemcalendar/SystemcalendarService.java | 9 ++- .../SystemcalendarServiceImpl.java | 55 +++++++++---- .../module/wms/service/team/TeamService.java | 10 ++- .../wms/service/team/TeamServiceImpl.java | 60 +++++++++----- .../transaction/TransactionService.java | 8 ++ .../transaction/TransactionServiceImpl.java | 6 +- .../TransactiontypeService.java | 11 ++- .../TransactiontypeServiceImpl.java | 66 ++++++++++----- .../TransferissueJobDetailService.java | 9 +++ .../TransferissueJobDetailServiceImpl.java | 5 ++ .../TransferissueJobMainService.java | 8 ++ .../TransferissueJobMainServiceImpl.java | 7 +- .../TransferissueRecordDetailService.java | 8 ++ .../TransferissueRecordDetailServiceImpl.java | 6 +- .../TransferissueRecordMainService.java | 8 ++ .../TransferissueRecordMainServiceImpl.java | 6 +- .../TransferissueRequestDetailService.java | 10 +++ ...TransferissueRequestDetailServiceImpl.java | 6 +- .../TransferissueRequestMainService.java | 8 ++ .../TransferissueRequestMainServiceImpl.java | 5 ++ .../transferlog/TransferlogService.java | 8 ++ .../transferlog/TransferlogServiceImpl.java | 5 ++ .../TransferreceiptJobDetailService.java | 8 ++ .../TransferreceiptJobDetailServiceImpl.java | 6 +- .../TransferreceiptJobMainService.java | 8 ++ .../TransferreceiptJobMainServiceImpl.java | 7 +- .../TransferreceiptRecordDetailService.java | 8 ++ ...ransferreceiptRecordDetailServiceImpl.java | 6 ++ .../TransferreceiptRecordMainService.java | 8 ++ .../TransferreceiptRecordMainServiceImpl.java | 6 +- .../TransferreceiptRequestDetailService.java | 8 ++ .../TransferreceiptRequestMainService.java | 8 ++ ...TransferreceiptRequestMainServiceImpl.java | 6 ++ .../UnplannedissueJobDetailService.java | 8 ++ .../UnplannedissueJobDetailServiceImpl.java | 5 ++ .../UnplannedissueJobMainService.java | 8 ++ .../UnplannedissueJobMainServiceImpl.java | 7 +- .../UnplannedissueRecordDetailService.java | 8 ++ ...UnplannedissueRecordDetailServiceImpl.java | 5 ++ .../UnplannedissueRecordMainService.java | 8 ++ .../UnplannedissueRecordMainServiceImpl.java | 6 +- .../UnplannedissueRequestDetailService.java | 8 ++ ...nplannedissueRequestDetailServiceImpl.java | 6 +- .../UnplannedissueRequestMainService.java | 8 ++ .../UnplannedissueRequestMainServiceImpl.java | 6 +- .../UnplannedreceiptJobDetailService.java | 8 ++ .../UnplannedreceiptJobDetailServiceImpl.java | 6 ++ .../UnplannedreceiptJobMainService.java | 8 ++ .../UnplannedreceiptJobMainServiceImpl.java | 12 +-- .../UnplannedreceiptRecordDetailService.java | 8 ++ ...plannedreceiptRecordDetailServiceImpl.java | 10 +-- .../UnplannedreceiptRecordMainService.java | 9 +++ ...UnplannedreceiptRecordMainServiceImpl.java | 11 ++- .../UnplannedreceiptRequestDetailService.java | 8 ++ ...lannedreceiptRequestDetailServiceImpl.java | 6 ++ .../UnplannedreceiptRequestMainService.java | 9 +++ ...nplannedreceiptRequestMainServiceImpl.java | 6 +- .../service/warehouse/WarehouseService.java | 11 ++- .../warehouse/WarehouseServiceImpl.java | 47 ++++++++--- .../wms/service/work/WorkDetailService.java | 9 +++ .../service/work/WorkDetailServiceImpl.java | 6 ++ .../wms/service/work/WorkMainService.java | 9 +++ .../wms/service/work/WorkMainServiceImpl.java | 6 ++ .../wms/service/workshop/WorkshopService.java | 11 ++- .../service/workshop/WorkshopServiceImpl.java | 56 +++++++++---- .../workstation/WorkstationService.java | 10 +++ .../workstation/WorkstationServiceImpl.java | 66 ++++++++++----- 394 files changed, 3962 insertions(+), 685 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index a4d71891..be21c472 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -23,7 +23,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -31,7 +30,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java index f9e45adc..9fc7cf74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapJob; +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.productscrapJob.vo.*; @@ -91,7 +92,19 @@ public class ProductscrapJobDetailController { PageResult pageResult = productscrapJobDetailService.getProductscrapJobDetailPage(pageVO); return success(ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-job-detail:query')") + public CommonResult> getProductscrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapJobDetailService.getProductscrapJobDetailSenior(conditions); + PageResult result = ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapJobDetailRespVO 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:productscrap-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java index 394d2019..c4a62a71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.productscrapJob; +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.inspectRecord.vo.InspectRecordMainExcelVO; import com.win.module.wms.controller.productscrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -11,22 +11,16 @@ 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.productscrapJob.vo.*; import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobMainDO; import com.win.module.wms.convert.productscrapJob.ProductscrapJobMainConvert; import com.win.module.wms.service.productscrapJob.ProductscrapJobMainService; @@ -42,7 +36,19 @@ public class ProductscrapJobMainController { @Resource private AdminUserApi userApi; - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:query')") + public CommonResult> getProductscrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapJobMainService.getProductscrapJobMainSenior(conditions); + PageResult result = ProductscrapJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PostMapping("/create") @Operation(summary = "创建制品报废任务主") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:create')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java index 03ba3916..f9357371 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapRecord; +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.productscrapRecord.vo.*; @@ -41,7 +42,19 @@ public class ProductscrapRecordDetailController { @Resource private AdminUserApi userApi; - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得创建制品报废记录子信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:query')") + public CommonResult> getProductscrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRecordDetailService.getProductscrapRecordDetailSenior(conditions); + PageResult result = ProductscrapRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PostMapping("/create") @Operation(summary = "创建制品报废记录子") @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:create')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java index ded20bf4..4d3bc6a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapRecord; +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.productscrapRecord.vo.*; @@ -48,7 +49,19 @@ public class ProductscrapRecordMainController { public CommonResult createProductscrapRecordMain(@Valid @RequestBody ProductscrapRecordMainCreateReqVO createReqVO) { return success(productscrapRecordMainService.createProductscrapRecordMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ProductscrapRecordMain:query')") + public CommonResult> getProductscrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRecordMainService.getProductscrapRecordMainSenior(conditions); + PageResult result = ProductscrapRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新制品报废记录主") @PreAuthorize("@ss.hasPermission('wms:productscrap-record-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java index 1b780959..4d7eb6f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.productscrapRequest; - +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.productscrapRequest.vo.*; @@ -10,22 +10,16 @@ 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.productscrapRequest.vo.*; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO; import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestDetailConvert; import com.win.module.wms.service.productscrapRequest.ProductscrapRequestDetailService; @@ -91,7 +85,19 @@ public class ProductscrapRequestDetailController { PageResult pageResult = productscrapRequestDetailService.getProductscrapRequestDetailPage(pageVO); return success(ProductscrapRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-request-detail:query')") + public CommonResult> getProductscrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRequestDetailService.getProductscrapRequestDetailSenior(conditions); + PageResult result = ProductscrapRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRequestDetailRespVO 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:productscrap-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java index 994f69d6..6d98f3f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapRequest; +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.productscrapRequest.vo.*; @@ -65,7 +66,19 @@ public class ProductscrapRequestMainController { productscrapRequestMainService.deleteProductscrapRequestMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:query')") + public CommonResult> getProductscrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRequestMainService.getProductscrapRequestMainSenior(conditions); + PageResult result = ProductscrapRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得制品报废申请主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index 1bcd4b6b..05f79879 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.project; 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; @@ -75,7 +76,19 @@ public class ProjectController { ProjectDO project = projectService.getProject(id); return success(ProjectConvert.INSTANCE.convert(project)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:project:query')") + public CommonResult> getProjectSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = projectService.getProjectSenior(conditions); + PageResult result = ProjectConvert.INSTANCE.convertPage(pageResult); + for(ProjectRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得项目列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java index 476ad78a..d8513872 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchase; +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.purchase.vo.*; @@ -91,7 +92,19 @@ public class PurchaseDetailController { PageResult pageResult = purchaseDetailService.getPurchaseDetailPage(pageVO); return success(PurchaseDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购订单子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-detail:query')") + public CommonResult> getPurchaseDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseDetailService.getPurchaseDetailSenior(conditions); + PageResult result = PurchaseDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchaseDetailRespVO 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:purchase-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java index cc401a08..921b020a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchase; +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.purchase.vo.*; @@ -55,7 +56,19 @@ public class PurchaseMainController { purchaseMainService.updatePurchaseMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-main:query')") + public CommonResult> getPurchaseMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseMainService.getPurchaseMainSenior(conditions); + PageResult result = PurchaseMainConvert.INSTANCE.convertPage(pageResult); + for(PurchaseMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除采购订单主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java index c4e1c710..2101a865 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasePlan; +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.purchasePlan.vo.*; @@ -55,7 +56,19 @@ public class PurchasePlanDetailController { purchasePlanDetailService.updatePurchasePlanDetail(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得要货计划子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-plan-detail:query')") + public CommonResult> getPurchasePlanDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasePlanDetailService.getPurchasePlanDetailSenior(conditions); + PageResult result = PurchasePlanDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasePlanDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除要货计划子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java index 980492b6..6fd4a09c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasePlan; +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.purchasePlan.vo.*; @@ -90,7 +91,19 @@ public class PurchasePlanMainController { PageResult pageResult = purchasePlanMainService.getPurchasePlanMainPage(pageVO); return success(PurchasePlanMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:query')") + public CommonResult> getPurchasePlanMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasePlanMainService.getPurchasePlanMainSenior(conditions); + PageResult result = PurchasePlanMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasePlanMainRespVO 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:purchase-plan-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java index 9b61c463..85c3ca38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchaseclaimRecord; +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.purchaseclaimRecord.vo.*; @@ -48,7 +49,19 @@ public class PurchaseclaimRecordDetailController { public CommonResult createPurchaseclaimRecordDetail(@Valid @RequestBody PurchaseclaimRecordDetailCreateReqVO createReqVO) { return success(purchaseclaimRecordDetailService.createPurchaseclaimRecordDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchaseclaimRecordDetail:query')") + public CommonResult> getPurchaseclaimRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailSenior(conditions); + PageResult result = PurchaseclaimRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchaseclaimRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购索赔记录子") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java index 8c975fd7..be2b389a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchaseclaimRecord; +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.purchaseclaimRecord.vo.*; @@ -89,7 +90,19 @@ public class PurchaseclaimRecordMainController { PageResult pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainPage(pageVO); return success(PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-main:query')") + public CommonResult> getPurchaseclaimRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainSenior(conditions); + PageResult result = PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchaseclaimRecordMainRespVO 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:purchaseclaim-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java index c4898f56..7590f879 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailCreateReqVO; import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailPageReqVO; import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java index 90579b4c..1367e863 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.purchaseprice; 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; @@ -49,7 +50,19 @@ public class PurchasepriceController { public CommonResult createPurchaseprice(@Valid @RequestBody PurchasepriceCreateReqVO createReqVO) { return success(purchasepriceService.createPurchaseprice(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购价格单信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchaseprice:query')") + public CommonResult> getPurchasepriceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasepriceService.getPurchasepriceSenior(conditions); + PageResult result = PurchasepriceConvert.INSTANCE.convertPage(pageResult); + for(PurchasepriceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购价格单") @PreAuthorize("@ss.hasPermission('wms:purchaseprice:update')") @@ -106,8 +119,12 @@ public class PurchasepriceController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.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/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index cc089c59..516e02d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptJob; +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 org.springframework.web.bind.annotation.*; @@ -74,7 +75,19 @@ public class PurchasereceiptJobDetailController { PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id); return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货任务子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')") + public CommonResult> getPurchasereceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptJobDetailService.getPurchasereceiptJobDetailSenior(conditions); + PageResult result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得采购收货任务子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 85152938..ba8d5cfd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptJob; +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 org.springframework.web.bind.annotation.*; @@ -91,7 +92,19 @@ public class PurchasereceiptJobMainController { PageResult pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(pageVO); return success(PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货任务主信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')") + public CommonResult> getPurchasereceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainSenior(conditions); + PageResult result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptJobMainRespVO 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:purchasereceipt-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index 73b6a875..4f6da022 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.purchasereceiptRecord; +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.purchasereceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class PurchasereceiptRecordDetailController { PageResult pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailPage(pageVO); return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货记录子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") + public CommonResult> getPurchasereceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailSenior(conditions); + PageResult result = PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRecordDetailRespVO 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:purchasereceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java index 3b431bb7..0f2c78a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptRecord; +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.purchasereceiptRecord.vo.*; @@ -55,7 +56,19 @@ public class PurchasereceiptRecordMainController { purchasereceiptRecordMainService.updatePurchasereceiptRecordMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货记录主信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRecordMain:query')") + public CommonResult> getPurchasereceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRecordMainService.getPurchasereceiptRecordMainSenior(conditions); + PageResult result = PurchasereceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除采购收货记录主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index ddcad895..f188a910 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptRequest; +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.purchasereceiptRequest.vo.*; @@ -49,7 +50,19 @@ public class PurchasereceiptRequestDetailController { public CommonResult createPurchasereceiptRequestDetail(@Valid @RequestBody PurchasereceiptRequestDetailCreateReqVO createReqVO) { return success(purchasereceiptRequestDetailService.createPurchasereceiptRequestDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRequestDetail:query')") + public CommonResult> getPurchasereceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailSenior(conditions); + PageResult result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购收货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index d5cad708..ba77fa8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptRequest; +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.purchasereceiptRequest.vo.*; @@ -65,7 +66,19 @@ public class PurchasereceiptRequestMainController { purchasereceiptRequestMainService.deletePurchasereceiptRequestMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')") + public CommonResult> getPurchasereceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRequestMainService.getPurchasereceiptRequestMainSenior(conditions); + PageResult result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得采购收货申请主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java index 80f471a8..ffc9e8c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.purchasereturnJob; +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.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO; import com.win.module.wms.controller.purchasereturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,6 +92,19 @@ public class PurchasereturnJobDetailController { PageResult pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailPage(pageVO); return success(PurchasereturnJobDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobDetail:query')") + public CommonResult> getPurchasereturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailSenior(conditions); + PageResult result = PurchasereturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购退货任务子 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java index 39f155e7..74ca1e1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.purchasereturnJob; +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.purchasereturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,7 +35,8 @@ import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobMainService @RequestMapping("/wms/purchasereturn-job-main") @Validated public class PurchasereturnJobMainController { - + @Resource + private AdminUserApi userApi; @Resource private PurchasereturnJobMainService purchasereturnJobMainService; @@ -77,7 +81,19 @@ public class PurchasereturnJobMainController { List list = purchasereturnJobMainService.getPurchasereturnJobMainList(ids); return success(PurchasereturnJobMainConvert.INSTANCE.convertList(list)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobMain:query')") + public CommonResult> getPurchasereturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnJobMainService.getPurchasereturnJobMainSenior(conditions); + PageResult result = PurchasereturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得采购退货任务主分页") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java index 2bf6fa31..f11ebd52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java @@ -8,5 +8,6 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PurchasereturnJobDetailRespVO extends PurchasereturnJobDetailBaseVO { - + @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/purchasereturnRecord/PurchasereturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java index 3fefb4f0..b3ad85ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereturnRecord; +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.purchasereturnRecord.vo.*; @@ -48,7 +49,19 @@ public class PurchasereturnRecordDetailController { public CommonResult createPurchasereturnRecordDetail(@Valid @RequestBody PurchasereturnRecordDetailCreateReqVO createReqVO) { return success(purchasereturnRecordDetailService.createPurchasereturnRecordDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购退货记录子信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordDetail:query')") + public CommonResult> getPurchasereturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRecordDetailService.getPurchasereturnRecordDetailSenior(conditions); + PageResult result = PurchasereturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购退货记录子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java index 42ee8099..4c1b9ee0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereturnRecord; +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.purchasereturnRecord.vo.*; @@ -47,7 +48,19 @@ public class PurchasereturnRecordMainController { public CommonResult createPurchasereturnRecordMain(@Valid @RequestBody PurchasereturnRecordMainCreateReqVO createReqVO) { return success(purchasereturnRecordMainService.createPurchasereturnRecordMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordMain:query')") + public CommonResult> getPurchasereturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRecordMainService.getPurchasereturnRecordMainSenior(conditions); + PageResult result = PurchasereturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购退货记录主") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java index 9dedee3d..b3f493b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.purchasereturnRequest; +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.purchasereturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -48,7 +48,19 @@ public class PurchasereturnRequestDetailController { public CommonResult createPurchasereturnRequestDetail(@Valid @RequestBody PurchasereturnRequestDetailCreateReqVO createReqVO) { return success(purchasereturnRequestDetailService.createPurchasereturnRequestDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购退货申请子信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestDetail:query')") + public CommonResult> getPurchasereturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRequestDetailService.getPurchasereturnRequestDetailSenior(conditions); + PageResult result = PurchasereturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购退货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index bd26965e..a24256fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereturnRequest; +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.purchasereturnRequest.vo.*; @@ -90,6 +91,19 @@ public class PurchasereturnRequestMainController { PageResult pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainPage(pageVO); return success(PurchasereturnRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestMain:query')") + public CommonResult> getPurchasereturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainSenior(conditions); + PageResult result = PurchasereturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购退货申请主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java index 94ad9682..665836e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayJob; +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.putawayJob.vo.*; @@ -91,7 +92,19 @@ public class PutawayJobDetailController { PageResult pageResult = putawayJobDetailService.getPutawayJobDetailPage(pageVO); return success(PutawayJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") + public CommonResult> getPutawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayJobDetailService.getPutawayJobDetailSenior(conditions); + PageResult result = PutawayJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PutawayJobDetailRespVO 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:putaway-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index 541696b9..115c5288 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayJob; +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.putawayJob.vo.*; @@ -47,7 +48,19 @@ public class PutawayJobMainController { public CommonResult createPutawayJobMain(@Valid @RequestBody PutawayJobMainCreateReqVO createReqVO) { return success(putawayJobMainService.createPutawayJobMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PutawayJobMain:query')") + public CommonResult> getPutawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayJobMainService.getPutawayJobMainSenior(conditions); + PageResult result = PutawayJobMainConvert.INSTANCE.convertPage(pageResult); + for(PutawayJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新上架任务主") @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java index 61ebf829..d1cf0ed0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.putawayRecord; +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.putawayRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,6 +65,19 @@ public class PutawayRecordDetailController { putawayRecordDetailService.deletePutawayRecordDetail(id); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") + public CommonResult> getPutawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRecordDetailService.getPutawayRecordDetailSenior(conditions); + PageResult result = PutawayRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PutawayRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得上架记录子") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java index 82131623..6ebd2842 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayRecord; +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.putawayRecord.vo.*; @@ -90,6 +91,19 @@ public class PutawayRecordMainController { PageResult pageResult = putawayRecordMainService.getPutawayRecordMainPage(pageVO); return success(PutawayRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PutawayRecordMain:query')") + public CommonResult> getPutawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRecordMainService.getPutawayRecordMainSenior(conditions); + PageResult result = PutawayRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PutawayRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出上架记录主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java index f2ba07be..bf2e1037 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.putawayRequest; +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.putawayRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class PutawayRequestDetailController { PageResult pageResult = putawayRequestDetailService.getPutawayRequestDetailPage(pageVO); return success(PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上架申请子信息分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:query')") + public CommonResult> getPutawayRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRequestDetailService.getPutawayRequestDetailSenior(conditions); + PageResult result = PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PutawayRequestDetailRespVO 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:putaway-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java index a7fd6400..f0aaee10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayRequest; +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.putawayRequest.vo.*; @@ -10,21 +11,16 @@ 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.dal.dataobject.putawayRequest.PutawayRequestMainDO; import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert; import com.win.module.wms.service.putawayRequest.PutawayRequestMainService; @@ -72,7 +68,19 @@ public class PutawayRequestMainController { PutawayRequestMainDO putawayRequestMain = putawayRequestMainService.getPutawayRequestMain(id); return success(PutawayRequestMainConvert.INSTANCE.convert(putawayRequestMain)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PutawayRequestMain:query')") + public CommonResult> getPutawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRequestMainService.getPutawayRequestMainSenior(conditions); + PageResult result = PutawayRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PutawayRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得上架申请主列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java index 78c0b6dd..973d7b05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.recordsetting; 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; @@ -20,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -28,7 +28,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -58,7 +57,20 @@ public class RecordsettingController { recordsettingService.updateRecordsetting(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:recordsetting:query')") + public CommonResult> getRecordsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = recordsettingService.getRecordsettingSenior(conditions); + PageResult result = RecordsettingConvert.INSTANCE.convertPage(pageResult); + for(RecordsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @DeleteMapping("/delete") @Operation(summary = "删除记录设置") @Parameter(name = "id", description = "编号", required = true) @@ -107,8 +119,13 @@ public class RecordsettingController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); + mapDropDown.put(1, interfaceType); + + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(2, available); + ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.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/repleinshJob/RepleinshJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java index 8140b472..42ca7cd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java @@ -2,6 +2,7 @@ package com.win.module.wms.controller.repleinshJob; +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.repleinshJob.vo.*; @@ -77,6 +78,20 @@ public class RepleinshJobDetailController { return success(RepleinshJobDetailConvert.INSTANCE.convert(repleinshJobDetail)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:RepleinshJobDetail:query')") + public CommonResult> getRepleinshJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshJobDetailService.getRepleinshJobDetailSenior(conditions); + PageResult result = RepleinshJobDetailConvert.INSTANCE.convertPage(pageResult); + for(RepleinshJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/list") @Operation(summary = "获得补料任务子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java index 077aed04..c369b6bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.repleinshJob; +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 org.springframework.web.bind.annotation.*; @@ -8,9 +9,7 @@ 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.constraints.*; +import io.swagger.v3.oas.annotations.Operation;; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -48,7 +47,19 @@ public class RepleinshJobMainController { public CommonResult createRepleinshJobMain(@Valid @RequestBody RepleinshJobMainCreateReqVO createReqVO) { return success(repleinshJobMainService.createRepleinshJobMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得补料任务主信息分页") + @PreAuthorize("@ss.hasPermission('wms:RepleinshJobMain:query')") + public CommonResult> getRepleinshJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshJobMainService.getRepleinshJobMainSenior(conditions); + PageResult result = RepleinshJobMainConvert.INSTANCE.convertPage(pageResult); + for(RepleinshJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新补料任务主") @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java index 435607a8..823d2e8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.repleinshRecord; +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 org.springframework.web.bind.annotation.*; @@ -9,8 +10,6 @@ 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.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -65,6 +64,19 @@ public class RepleinshRecordDetailController { repleinshRecordDetailService.deleteRepleinshRecordDetail(id); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-record-detail:query')") + public CommonResult> getRepleinshRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRecordDetailService.getRepleinshRecordDetailSenior(conditions); + PageResult result = RepleinshRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得补料记录子") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java index 03373bff..e39567b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.repleinshRecord; +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 org.springframework.web.bind.annotation.*; @@ -56,6 +57,19 @@ public class RepleinshRecordMainController { repleinshRecordMainService.updateRepleinshRecordMain(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得补料记录主信息分页") + @PreAuthorize("@ss.hasPermission('wms:RepleinshRecordMain:query')") + public CommonResult> getRepleinshRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRecordMainService.getRepleinshRecordMainSenior(conditions); + PageResult result = RepleinshRecordMainConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除补料记录主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java index d72edd95..e8ecf5fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.repleinshRequest; +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.repleinshRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,7 +65,19 @@ public class RepleinshRequestDetailController { repleinshRequestDetailService.deleteRepleinshRequestDetail(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-detail:query')") + public CommonResult> getRepleinshRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRequestDetailService.getRepleinshRequestDetailSenior(conditions); + PageResult result = RepleinshRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得补料申请子") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java index caa814dd..4cae14f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.repleinshRequest; +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.repleinshRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,6 +65,19 @@ public class RepleinshRequestMainController { repleinshRequestMainService.deleteRepleinshRequestMain(id); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-main:query')") + public CommonResult> getRepleinshRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRequestMainService.getRepleinshRequestMainSenior(conditions); + PageResult result = RepleinshRequestMainConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得补料申请主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java index 8bf7f0c1..c6639d2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.requestsetting; 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; @@ -76,7 +77,19 @@ public class RequestsettingController { RequestsettingDO requestsetting = requestsettingService.getRequestsetting(id); return success(RequestsettingConvert.INSTANCE.convert(requestsetting)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Requestsetting:query')") + public CommonResult> getRequestsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = requestsettingService.getRequestsettingSenior(conditions); + PageResult result = RequestsettingConvert.INSTANCE.convertPage(pageResult); + for(RequestsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得申请设置列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @@ -107,8 +120,20 @@ public class RequestsettingController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] requestMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_MODE); + mapDropDown.put(1, requestMode); + String[] autoCommit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(2, autoCommit); + String[] autoAgree = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, autoAgree); + String[] autoExecute = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, autoExecute); + String[] directCreateRecord = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(5, directCreateRecord); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(6, available); + ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.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/rule/RuleController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java index fbddfc3b..28c3e59a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java @@ -1,8 +1,10 @@ package com.win.module.wms.controller.rule; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.rule.vo.RuleCreateReqVO; import com.win.module.wms.controller.rule.vo.RulePageReqVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; @@ -66,6 +68,19 @@ public class RuleController { RuleDO rule = ruleService.getRule(id); return success(RuleConvert.INSTANCE.convert(rule)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:rule:query')") + public CommonResult> getRuleSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = ruleService.getRuleSenior(conditions); + PageResult result = RuleConvert.INSTANCE.convertPage(pageResult); + for(RuleRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得规则分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java index bdf61db6..848ef3ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java @@ -8,5 +8,6 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class RuleRespVO extends RuleBaseVO { - + @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/sale/SaleDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java index e7e77bc8..86dd8624 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.sale; +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.sale.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,6 +91,20 @@ public class SaleDetailController { PageResult pageResult = saleDetailService.getSaleDetailPage(pageVO); return success(SaleDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:sale-detail:query')") + public CommonResult> getSaleDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = saleDetailService.getSaleDetailSenior(conditions); + PageResult result = SaleDetailConvert.INSTANCE.convertPage(pageResult); + for(SaleDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出销售订单子 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java index d585710c..e5c8470d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.sale; +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.sale.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -56,6 +56,19 @@ public class SaleMainController { saleMainService.updateSaleMain(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得销售订单主信息分页") + @PreAuthorize("@ss.hasPermission('wms:sale-main:query')") + public CommonResult> getSaleMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = saleMainService.getSaleMainSenior(conditions); + PageResult result = SaleMainConvert.INSTANCE.convertPage(pageResult); + for(SaleMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除销售订单主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index 7bc89f01..b3bfdf05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.saleprice; 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; @@ -94,7 +95,19 @@ public class SalepriceController { PageResult pageResult = salepriceService.getSalepricePage(pageVO); return success(SalepriceConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得销售价格单信息分页") + @PreAuthorize("@ss.hasPermission('wms:Saleprice:query')") + public CommonResult> getSalepriceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = salepriceService.getSalepriceSenior(conditions); + PageResult result = SalepriceConvert.INSTANCE.convertPage(pageResult); + for(SalepriceRespVO 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:saleprice:export')") @@ -109,7 +122,12 @@ public class SalepriceController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.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/scrapJob/ScrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java index c6a5056f..628fe75b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.scrapJob; +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.scrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,7 +65,19 @@ public class ScrapJobDetailController { scrapJobDetailService.deleteScrapJobDetail(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapJobDetail:query')") + public CommonResult> getScrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapJobDetailService.getScrapJobDetailSenior(conditions); + PageResult result = ScrapJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ScrapJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得报废出库任务子") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java index 4aaab40c..0fe032a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java @@ -1,8 +1,9 @@ package com.win.module.wms.controller.scrapJob; +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.scrapJob.vo.*; + import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -48,7 +49,19 @@ public class ScrapJobMainController { public CommonResult createScrapJobMain(@Valid @RequestBody ScrapJobMainCreateReqVO createReqVO) { return success(scrapJobMainService.createScrapJobMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapJobMain:query')") + public CommonResult> getScrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapJobMainService.getScrapJobMainSenior(conditions); + PageResult result = ScrapJobMainConvert.INSTANCE.convertPage(pageResult); + for(ScrapJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新报废出库任务主") @PreAuthorize("@ss.hasPermission('wms:scrap-job-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java index 2c2edce4..29461b71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.scrapRecord; -import com.win.module.wms.controller.scrapRecord.vo.*; +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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,10 @@ public class ScrapRecordDetailController { @Resource private ScrapRecordDetailService scrapRecordDetailService; + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") @Operation(summary = "创建报废出库记录子") @PreAuthorize("@ss.hasPermission('wms:scrap-record-detail:create')") @@ -69,6 +75,19 @@ public class ScrapRecordDetailController { ScrapRecordDetailDO scrapRecordDetail = scrapRecordDetailService.getScrapRecordDetail(id); return success(ScrapRecordDetailConvert.INSTANCE.convert(scrapRecordDetail)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapRecordDetail:query')") + public CommonResult> getScrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRecordDetailService.getScrapRecordDetailSenior(conditions); + PageResult result = ScrapRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ScrapRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得报废出库记录子列表") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java index 12ea664e..dd9b1627 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.scrapRecord; -import com.win.module.wms.controller.scrapRecord.vo.*; +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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class ScrapRecordMainController { @Resource private ScrapRecordMainService scrapRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库记录主") @PreAuthorize("@ss.hasPermission('wms:scrap-record-main:create')") @@ -86,6 +91,19 @@ public class ScrapRecordMainController { PageResult pageResult = scrapRecordMainService.getScrapRecordMainPage(pageVO); return success(ScrapRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得报废出库记录主信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapRecordMain:query')") + public CommonResult> getScrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRecordMainService.getScrapRecordMainSenior(conditions); + PageResult result = ScrapRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ScrapRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出报废出库记录主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java index d10887d0..779a63ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.scrapRequest; - +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.scrapRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,22 +10,16 @@ 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.scrapRequest.vo.*; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService; @@ -37,6 +33,10 @@ public class ScrapRequestDetailController { @Resource private ScrapRequestDetailService scrapRequestDetailService; + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") @Operation(summary = "创建报废出库申请子") @PreAuthorize("@ss.hasPermission('wms:scrap-request-detail:create')") @@ -51,7 +51,19 @@ public class ScrapRequestDetailController { scrapRequestDetailService.updateScrapRequestDetail(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapRequestDetail:query')") + public CommonResult> getScrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRequestDetailService.getScrapRequestDetailSenior(conditions); + PageResult result = ScrapRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ScrapRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除报废出库申请子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java index 41a2200e..0dd7ddd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.scrapRequest; +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.scrapRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,22 +11,16 @@ 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.scrapRequest.vo.*; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert; import com.win.module.wms.service.scrapRequest.ScrapRequestMainService; @@ -37,6 +34,9 @@ public class ScrapRequestMainController { @Resource private ScrapRequestMainService scrapRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库申请主") @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:create')") @@ -87,6 +87,21 @@ public class ScrapRequestMainController { return success(ScrapRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:query')") + public CommonResult> getScrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRequestMainService.getScrapRequestMainSenior(conditions); + PageResult result = ScrapRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ScrapRequestMainRespVO 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:scrap-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java index 3a3d30fe..a2b3ea2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.shift; 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; @@ -21,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -29,7 +29,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -94,6 +93,19 @@ public class ShiftController { PageResult pageResult = shiftService.getShiftPage(pageVO); return success(ShiftConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得班次信息分页") + @PreAuthorize("@ss.hasPermission('wms:shift:query')") + public CommonResult> getShiftSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = shiftService.getShiftSenior(conditions); + PageResult result = ShiftConvert.INSTANCE.convertPage(pageResult); + for(ShiftRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出班次 Excel") @@ -109,7 +121,12 @@ public class ShiftController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, available); + String[] endAtNextDay = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, endAtNextDay); + ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.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/stdcostprice/StdcostpriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java index 4b88b1d6..6fe56da0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.stdcostprice; 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; @@ -95,6 +96,20 @@ public class StdcostpriceController { return success(StdcostpriceConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得标准成本价格单信息分页") + @PreAuthorize("@ss.hasPermission('wms:Stdcostprice:query')") + public CommonResult> getStdcostpriceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = stdcostpriceService.getStdcostpriceSenior(conditions); + PageResult result = StdcostpriceConvert.INSTANCE.convertPage(pageResult); + for(StdcostpriceRespVO 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:stdcostprice:export')") @@ -108,8 +123,12 @@ public class StdcostpriceController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.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/strategy/StrategyController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java index f7840aea..2fba1578 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.strategy; 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; @@ -16,14 +17,12 @@ 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; @@ -53,6 +52,19 @@ public class StrategyController { strategyService.updateStrategy(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得策略信息分页") + @PreAuthorize("@ss.hasPermission('wms:strategy:query')") + public CommonResult> getStrategySenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = strategyService.getStrategySenior(conditions); + PageResult result = StrategyConvert.INSTANCE.convertPage(pageResult); + for(StrategyRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除策略") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java index 22403c5f..bdd152d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java @@ -15,5 +15,7 @@ public class StrategyRespVO extends StrategyBaseVO { @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) private String creatorId; + @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/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index db2551d2..ec0dbec1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.supplier; 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; @@ -50,7 +51,19 @@ public class SupplierController { public CommonResult createSupplier(@Valid @RequestBody SupplierCreateReqVO createReqVO) { return success(supplierService.createSupplier(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Supplier:query')") + public CommonResult> getSupplierSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierService.getSupplierSenior(conditions); + PageResult result = SupplierConvert.INSTANCE.convertPage(pageResult); + for(SupplierRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新供应商") @PreAuthorize("@ss.hasPermission('wms:supplier:update')") @@ -106,8 +119,14 @@ public class SupplierController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(11, currency); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE); + mapDropDown.put(13, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(14, available); + ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.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/supplierdeliverRecord/SupplierdeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java index 35ca478c..387a4b0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierdeliverRecord; +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.supplierdeliverRecord.vo.*; @@ -10,21 +11,16 @@ 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.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; @@ -73,7 +69,19 @@ public class SupplierdeliverRecordDetailController { SupplierdeliverRecordDetailDO supplierdeliverRecordDetail = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetail(id); return success(SupplierdeliverRecordDetailConvert.INSTANCE.convert(supplierdeliverRecordDetail)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRecordDetail:query')") + public CommonResult> getSupplierdeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailSenior(conditions); + PageResult result = SupplierdeliverRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得供应商发货记录子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index 0f103eb1..c20ea0bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.supplierdeliverRecord; +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.supplierdeliverRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,22 +11,16 @@ 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.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; @@ -37,6 +34,9 @@ public class SupplierdeliverRecordMainController { @Resource private SupplierdeliverRecordMainService supplierdeliverRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发货记录主") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:create')") @@ -52,6 +52,19 @@ public class SupplierdeliverRecordMainController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')") + public CommonResult> getSupplierdeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRecordMainService.getSupplierdeliverRecordMainSenior(conditions); + PageResult result = SupplierdeliverRecordMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除供应商发货记录主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java index f0ebda86..834d139d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierdeliverRequest; +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.supplierdeliverRequest.vo.*; @@ -57,6 +58,20 @@ public class SupplierdeliverRequestDetailController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestDetail:query')") + public CommonResult> getSupplierdeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRequestDetailService.getSupplierdeliverRequestDetailSenior(conditions); + PageResult result = SupplierdeliverRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @DeleteMapping("/delete") @Operation(summary = "删除供应商发货申请子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java index a58275c4..fefcdf44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.supplierdeliverRequest; - +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.supplierdeliverRequest.vo.*; @@ -10,21 +10,16 @@ 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.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO; import com.win.module.wms.convert.supplierdeliverRequest.SupplierdeliverRequestMainConvert; import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestMainService; @@ -82,6 +77,19 @@ public class SupplierdeliverRequestMainController { List list = supplierdeliverRequestMainService.getSupplierdeliverRequestMainList(ids); return success(SupplierdeliverRequestMainConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestMain:query')") + public CommonResult> getSupplierdeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRequestMainService.getSupplierdeliverRequestMainSenior(conditions); + PageResult result = SupplierdeliverRequestMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得供应商发货申请主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java index f6f9d9ff..1655e78f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRecord; +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.supplierinvoiceRecord.vo.*; @@ -90,7 +91,19 @@ public class SupplierinvoiceRecordDeatilController { PageResult pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilPage(pageVO); return success(SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-deatil:query')") + public CommonResult> getSupplierinvoiceRecordDeatilSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilSenior(conditions); + PageResult result = SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRecordDeatilRespVO 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:supplierinvoice-record-deatil:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java index db48ac79..cdb628dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRecord; +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.supplierinvoiceRecord.vo.*; @@ -10,21 +11,16 @@ 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.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordMainDO; import com.win.module.wms.convert.supplierinvoiceRecord.SupplierinvoiceRecordMainConvert; import com.win.module.wms.service.supplierinvoiceRecord.SupplierinvoiceRecordMainService; @@ -64,7 +60,19 @@ public class SupplierinvoiceRecordMainController { supplierinvoiceRecordMainService.deleteSupplierinvoiceRecordMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierinvoiceRecordMain:query')") + public CommonResult> getSupplierinvoiceRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRecordMainService.getSupplierinvoiceRecordMainSenior(conditions); + PageResult result = SupplierinvoiceRecordMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得供应商发票记录主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java index 0f89900d..5f784699 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRequest; +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.supplierinvoiceRequest.vo.*; @@ -73,7 +74,19 @@ public class SupplierinvoiceRequestDetailController { SupplierinvoiceRequestDetailDO supplierinvoiceRequestDetail = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetail(id); return success(SupplierinvoiceRequestDetailConvert.INSTANCE.convert(supplierinvoiceRequestDetail)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-detail:query')") + public CommonResult> getSupplierinvoiceRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetailSenior(conditions); + PageResult result = SupplierinvoiceRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得供应商发票申请子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java index 91c869ec..671da1e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRequest; +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.supplierinvoiceRequest.vo.*; @@ -90,7 +91,19 @@ public class SupplierinvoiceRequestMainController { PageResult pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainPage(pageVO); return success(SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得供应商发票申请主信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:query')") + public CommonResult> getSupplierinvoiceRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainSenior(conditions); + PageResult result = SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRequestMainRespVO 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:supplierinvoice-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java index 8a1c6150..15e5ddfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.supplieritem; 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; @@ -8,7 +9,6 @@ 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.supplieritem.vo.*; - import com.win.module.wms.convert.supplieritem.SupplieritemConvert; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; import com.win.module.wms.enums.DictTypeConstants; @@ -94,6 +94,19 @@ public class SupplieritemController { PageResult pageResult = supplieritemService.getSupplieritemPage(pageVO); return success(SupplieritemConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") + public CommonResult> getSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplieritemService.getSupplieritemSenior(conditions); + PageResult result = SupplieritemConvert.INSTANCE.convertPage(pageResult); + for(SupplieritemRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出供应商物品 Excel") @@ -108,8 +121,18 @@ public class SupplieritemController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(13, available); + String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(3, supplierUom); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(5, packUnit); + String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(7, altPackUnit); + String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE); + mapDropDown.put(12, settlementType); + ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.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/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index f0c7b036..a5b0b432 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.systemcalendar; 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.system.api.user.dto.AdminUserRespDTO;; import com.win.module.wms.controller.systemcalendar.vo.*; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; @@ -21,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -29,7 +29,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -94,7 +93,19 @@ public class SystemcalendarController { PageResult pageResult = systemcalendarService.getSystemcalendarPage(pageVO); return success(SystemcalendarConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Systemcalendar:query')") + public CommonResult> getSystemcalendarSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = systemcalendarService.getSystemcalendarSenior(conditions); + PageResult result = SystemcalendarConvert.INSTANCE.convertPage(pageResult); + for(SystemcalendarRespVO 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:systemcalendar:export')") @@ -108,8 +119,10 @@ public class SystemcalendarController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, available); + ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.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/team/TeamController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java index 8a70810b..8c75f4fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.team; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; @@ -96,7 +97,19 @@ public class TeamController { PageResult pageResult = teamService.getTeamPage(pageVO); return success(TeamConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:team:query')") + public CommonResult> getTeamSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = teamService.getTeamSenior(conditions); + PageResult result = TeamConvert.INSTANCE.convertPage(pageResult); + for(TeamRespVO 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:team:export')") @@ -111,7 +124,10 @@ public class TeamController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, available); + ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.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/transaction/TransactionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java index 8860cb9c..cb7ece5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transaction; +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.transaction.vo.*; @@ -83,7 +84,19 @@ public class TransactionController { List list = transactionService.getTransactionList(ids); return success(TransactionConvert.INSTANCE.convertList(list)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Transaction:query')") + public CommonResult> getTransactionSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transactionService.getTransactionSenior(conditions); + PageResult result = TransactionConvert.INSTANCE.convertPage(pageResult); + for(TransactionRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得库存事务分页") @PreAuthorize("@ss.hasPermission('wms:transaction:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java index c219ad39..ce2a812d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java @@ -9,4 +9,6 @@ import lombok.*; @ToString(callSuper = true) public class TransactionRespVO extends TransactionBaseVO { + @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/transactiontype/TransactiontypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java index da208526..56ba3c74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transactiontype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; @@ -70,7 +71,19 @@ public class TransactiontypeController { transactiontypeService.deleteTransactiontype(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Transactiontype:query')") + public CommonResult> getTransactiontypeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transactiontypeService.getTransactiontypeSenior(conditions); + PageResult result = TransactiontypeConvert.INSTANCE.convertPage(pageResult); + for(TransactiontypeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得事务类型") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -110,8 +123,14 @@ public class TransactiontypeController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] allowNegative = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, allowNegative); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, available); + String[] isSoftDeleted = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, isSoftDeleted); + ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.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/transferissueJob/TransferissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java index f92af4ba..9bb6a98c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferissueJob; +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.transferissueJob.vo.*; @@ -48,7 +49,19 @@ public class TransferissueJobDetailController { public CommonResult createTransferissueJobDetail(@Valid @RequestBody TransferissueJobDetailCreateReqVO createReqVO) { return success(transferissueJobDetailService.createTransferissueJobDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:query')") + public CommonResult> getTransferissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueJobDetailService.getTransferissueJobDetailSenior(conditions); + PageResult result = TransferissueJobDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferissueJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨出库任务子") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java index e54c3d5b..de94ae76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferissueJob; +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.transferissueJob.vo.*; @@ -91,7 +92,19 @@ public class TransferissueJobMainController { PageResult pageResult = transferissueJobMainService.getTransferissueJobMainPage(pageVO); return success(TransferissueJobMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')") + public CommonResult> getTransferissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueJobMainService.getTransferissueJobMainSenior(conditions); + PageResult result = TransferissueJobMainConvert.INSTANCE.convertPage(pageResult); + for(TransferissueJobMainRespVO 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:transferissue-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java index b7d9e86f..c62652e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferissueRecord; +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.transferissueRecord.vo.*; @@ -10,22 +11,16 @@ 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.transferissueRecord.vo.*; import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO; import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert; import com.win.module.wms.service.transferissueRecord.TransferissueRecordDetailService; @@ -82,6 +77,20 @@ public class TransferissueRecordDetailController { List list = transferissueRecordDetailService.getTransferissueRecordDetailList(ids); return success(TransferissueRecordDetailConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferissue-record-detail:query')") + public CommonResult> getTransferissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRecordDetailService.getTransferissueRequestDetailSenior(conditions); + PageResult result = TransferissueRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/page") @Operation(summary = "获得调拨出库记录子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java index 8895d510..ed7f6092 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.transferissueRecord; +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.transferissueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class TransferissueRecordMainController { @Resource private TransferissueRecordMainService transferissueRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨出库记录主") @PreAuthorize("@ss.hasPermission('wms:transferissue-record-main:create')") @@ -51,7 +57,20 @@ public class TransferissueRecordMainController { transferissueRecordMainService.updateTransferissueRecordMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:TransferissueRecordMain:query')") + public CommonResult> getTransferissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRecordMainService.getTransferissueRecordMainSenior(conditions); + PageResult result = TransferissueRecordMainConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @DeleteMapping("/delete") @Operation(summary = "删除调拨出库记录主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java index 353be48b..3bf9e4f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.transferissueRequest; +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.transferissueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,7 +39,8 @@ public class TransferissueRequestDetailController { @Resource private TransferissueRequestDetailService transferissueRequestDetailService; - + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建调拨出库申请子") @PreAuthorize("@ss.hasPermission('wms:transferissue-request-detail:create')") @@ -44,6 +48,19 @@ public class TransferissueRequestDetailController { return success(transferissueRequestDetailService.createTransferissueRequestDetail(createReqVO)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRequestDetailService.getTransferissueRequestDetailSenior(conditions); + PageResult result = TransferissueRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨出库申请子") @PreAuthorize("@ss.hasPermission('wms:transferissue-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java index d208cae2..3b8171b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.transferissueRequest; +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.transferissueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class TransferissueRequestMainController { @Resource private TransferissueRequestMainService transferissueRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨出库申请主") @PreAuthorize("@ss.hasPermission('wms:transferissue-request-main:create')") @@ -51,6 +57,19 @@ public class TransferissueRequestMainController { transferissueRequestMainService.updateTransferissueRequestMain(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRequestMainService.getTransferissueRequestMainSenior(conditions); + PageResult result = TransferissueRequestMainConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除调拨出库申请主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java index 4f3e7eef..04338a5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferlog; +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.transferlog.vo.*; @@ -57,6 +58,19 @@ public class TransferlogController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferlogSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferlogService.getTransferlogSenior(conditions); + PageResult result = TransferlogConvert.INSTANCE.convertPage(pageResult); + for(TransferlogRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除库存转移日志") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java index 2fd39fca..11bb6e63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java @@ -8,5 +8,7 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class TransferlogRespVO extends TransferlogBaseVO { + @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/transferreceiptJob/TransferreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java index 6ea03222..6184f8b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptJob; +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.transferreceiptJob.vo.*; @@ -15,17 +16,12 @@ 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.transferreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert; import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService; @@ -48,7 +44,19 @@ public class TransferreceiptJobDetailController { public CommonResult createTransferreceiptJobDetail(@Valid @RequestBody TransferreceiptJobDetailCreateReqVO createReqVO) { return success(transferreceiptJobDetailService.createTransferreceiptJobDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptJobDetailService.getTransferreceiptJobDetailSenior(conditions); + PageResult result = TransferreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨入库任务子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index ee8c0c4b..ecb65d91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptJob; +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.transferreceiptJob.vo.*; @@ -10,22 +11,16 @@ 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.transferreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert; import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobMainService; @@ -92,6 +87,20 @@ public class TransferreceiptJobMainController { return success(TransferreceiptJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptJobMainService.getTransferreceiptJobMainSenior(conditions); + PageResult result = TransferreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptJobMainRespVO 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:transferreceipt-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java index 20a9e13f..d19460d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRecord; +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.transferreceiptRecord.vo.*; @@ -10,22 +11,16 @@ 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.transferreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO; import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordDetailConvert; import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordDetailService; @@ -92,6 +87,19 @@ public class TransferreceiptRecordDetailController { return success(TransferreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRecordDetailService.getTransferreceiptRecordDetailSenior(conditions); + PageResult result = TransferreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRecordDetailRespVO 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:transferreceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java index 91ac5b2b..e8550e93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRecord; +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.transferreceiptRecord.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.transferreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert; import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordMainService; @@ -66,6 +66,20 @@ public class TransferreceiptRecordMainController { return success(true); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:TransferreceiptRecordMain:query')") + public CommonResult> getTransferreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRecordMainService.getTransferreceiptRecordMainSenior(conditions); + PageResult result = TransferreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得调拨入库记录主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java index bdb786b9..251b05b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRequest; +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.transferreceiptRequest.vo.*; @@ -48,7 +49,19 @@ public class TransferreceiptRequestDetailController { public CommonResult createTransferreceiptRequestDetail(@Valid @RequestBody TransferreceiptRequestDetailCreateReqVO createReqVO) { return success(transferreceiptRequestDetailService.createTransferreceiptRequestDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRequestDetailService.getTransferreceiptRequestDetailSenior(conditions); + PageResult result = TransferreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨入库申请子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java index e2607109..8e3f7e2a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRequest; +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.transferreceiptRequest.vo.*; @@ -10,22 +11,16 @@ 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.transferreceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO; import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestMainConvert; import com.win.module.wms.service.transferreceiptRequest.TransferreceiptRequestMainService; @@ -92,6 +87,21 @@ public class TransferreceiptRequestMainController { return success(TransferreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-main:query')") + public CommonResult> getTransferreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRequestMainService.getTransferreceiptRequestMainSenior(conditions); + PageResult result = TransferreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRequestMainRespVO 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:transferreceipt-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java index 67fe4efd..2be8eca9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueJob; +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.unplannedissueJob.vo.*; @@ -57,6 +58,19 @@ public class UnplannedissueJobDetailController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得计划外出库任务子信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getUnplannedissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueJobDetailService.getUnplannedissueJobDetailSenior(conditions); + PageResult result = UnplannedissueJobDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除计划外出库任务子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java index b8dd868a..20d5d4a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueJob; +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.unplannedissueJob.vo.*; @@ -56,7 +57,19 @@ public class UnplannedissueJobMainController { unplannedissueJobMainService.updateUnplannedissueJobMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getUnplannedissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueJobMainService.getUnplannedissueJobMainSenior(conditions); + PageResult result = UnplannedissueJobMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除计划外出库任务主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java index feb6ab81..59218b87 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRecord; +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.unplannedissueRecord.vo.*; @@ -48,7 +49,19 @@ public class UnplannedissueRecordDetailController { public CommonResult createUnplannedissueRecordDetail(@Valid @RequestBody UnplannedissueRecordDetailCreateReqVO createReqVO) { return success(unplannedissueRecordDetailService.createUnplannedissueRecordDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getUnplannedissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRecordDetailService.getUnplannedissueRecordDetailSenior(conditions); + PageResult result = UnplannedissueRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新计划外出库记录子") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java index aa7ae890..483297d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRecord; +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.unplannedissueRecord.vo.*; @@ -15,17 +16,12 @@ 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.unplannedissueRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert; import com.win.module.wms.service.unplannedissueRecord.UnplannedissueRecordMainService; @@ -91,7 +87,19 @@ public class UnplannedissueRecordMainController { PageResult pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainPage(pageVO); return success(UnplannedissueRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:query')") + public CommonResult> getUnplannedissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainSenior(conditions); + PageResult result = UnplannedissueRecordMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRecordMainRespVO 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:unplannedissue-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java index ee338f2a..55f8bce8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java @@ -86,6 +86,7 @@ public class UnplannedissueRecordMainBaseVO { @NotNull(message = "创建者Id不能为空") private String creatorId; + @Schema(description = "从仓库代码") private String fromWarehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java index 29f7eb49..41f63563 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java @@ -93,4 +93,5 @@ public class UnplannedissueRecordMainExcelVO { @ExcelProperty("创建者ID") private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java index 4ff4cbc7..3c42b98d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java @@ -9,4 +9,7 @@ import lombok.*; @ToString(callSuper = true) public class UnplannedissueRecordMainRespVO extends UnplannedissueRecordMainBaseVO { + @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/unplannedissueRequest/UnplannedissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java index 7d7ef502..f3ea7f43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRequest; +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.unplannedissueRequest.vo.*; @@ -83,7 +84,19 @@ public class UnplannedissueRequestDetailController { List list = unplannedissueRequestDetailService.getUnplannedissueRequestDetailList(ids); return success(UnplannedissueRequestDetailConvert.INSTANCE.convertList(list)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:query')") + public CommonResult> getUnplannedissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRequestDetailService.getUnplannedissueRequestDetailSenior(conditions); + PageResult result = UnplannedissueRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得计划外出库申请子分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java index 19ba43bf..89088728 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRequest; +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.unplannedissueRequest.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.unplannedissueRequest.vo.*; import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO; import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestMainConvert; import com.win.module.wms.service.unplannedissueRequest.UnplannedissueRequestMainService; @@ -84,6 +83,20 @@ public class UnplannedissueRequestMainController { return success(UnplannedissueRequestMainConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')") + public CommonResult> getUnplannedissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRequestMainService.getUnplannedissueRequestMainSenior(conditions); + PageResult result = UnplannedissueRequestMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/page") @Operation(summary = "获得计划外出库申请主分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java index 829866a8..03862ee8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptJob; +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.unplannedreceiptJob.vo.*; @@ -10,22 +11,16 @@ 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.unplannedreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO; import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobDetailConvert; import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobDetailService; @@ -57,6 +52,20 @@ public class UnplannedreceiptJobDetailController { return success(true); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-detail:query')") + public CommonResult> getUnplannedreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailSenior(conditions); + PageResult result = UnplannedreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除计划外入库任务子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java index 1777fc9e..7b80092a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.unplannedreceiptJob; - +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.unplannedreceiptJob.vo.*; @@ -10,22 +10,16 @@ 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.unplannedreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobMainConvert; import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobMainService; @@ -65,7 +59,19 @@ public class UnplannedreceiptJobMainController { unplannedreceiptJobMainService.deleteUnplannedreceiptJobMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')") + public CommonResult> getUnplannedreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptJobMainService.getUnplannedreceiptJobMainSenior(conditions); + PageResult result = UnplannedreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得计划外入库任务主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java index 5956df0d..2aaeaec4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptRecord; +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.unplannedreceiptRecord.vo.*; @@ -10,22 +11,16 @@ 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.unplannedreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO; import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordDetailConvert; import com.win.module.wms.service.unplannedreceiptRecord.UnplannedreceiptRecordDetailService; @@ -91,7 +86,19 @@ public class UnplannedreceiptRecordDetailController { PageResult pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailPage(pageVO); return success(UnplannedreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordDetail:query')") + public CommonResult> getUnplannedreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailSenior(conditions); + PageResult result = UnplannedreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRecordDetailRespVO 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:unplannedreceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java index e3348eab..8612fa9d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.unplannedreceiptRecord.vo.*; @@ -10,22 +12,16 @@ 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.unplannedreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordMainConvert; import com.win.module.wms.service.unplannedreceiptRecord.UnplannedreceiptRecordMainService; @@ -56,6 +52,7 @@ public class UnplannedreceiptRecordMainController { unplannedreceiptRecordMainService.updateUnplannedreceiptRecordMain(updateReqVO); return success(true); } + @DeleteMapping("/delete") @Operation(summary = "删除计划外入库记录主") @@ -65,7 +62,19 @@ public class UnplannedreceiptRecordMainController { unplannedreceiptRecordMainService.deleteUnplannedreceiptRecordMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordMain:query')") + public CommonResult> getUnplannedreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRecordMainService.getUnplannedreceiptRecordMainSenior(conditions); + PageResult result = UnplannedreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得计划外入库记录主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java index 952678a2..1e3b940e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptRequest; +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.unplannedreceiptRequest.vo.*; @@ -10,22 +11,16 @@ 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.unplannedreceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO; import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestDetailConvert; import com.win.module.wms.service.unplannedreceiptRequest.UnplannedreceiptRequestDetailService; @@ -92,6 +87,19 @@ public class UnplannedreceiptRequestDetailController { return success(UnplannedreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRequestDetail:query')") + public CommonResult> getUnplannedreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRequestDetailService.getUnplannedreceiptRequestDetailSenior(conditions); + PageResult result = UnplannedreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRequestDetailRespVO 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:unplannedreceipt-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java index fca26ad1..f924cdbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptRequest; +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.unplannedreceiptRequest.vo.*; @@ -10,22 +11,16 @@ 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.unplannedreceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO; import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestMainConvert; import com.win.module.wms.service.unplannedreceiptRequest.UnplannedreceiptRequestMainService; @@ -91,6 +86,19 @@ public class UnplannedreceiptRequestMainController { PageResult pageResult = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMainPage(pageVO); return success(UnplannedreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRequestMain:query')") + public CommonResult> getUnplannedreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMainSenior(conditions); + PageResult result = UnplannedreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出计划外入库申请主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index fca3d490..07fbb235 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -2,16 +2,17 @@ package com.win.module.wms.controller.warehouse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.itembasic.vo.ItembasicImportExcelVo; +import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; +import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; import com.win.module.wms.controller.warehouse.vo.*; -import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.convert.warehouse.WarehouseConvert; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; @@ -25,7 +26,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -33,7 +33,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -115,7 +114,12 @@ public class WarehouseController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, type); + ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入仓库信息模板") @@ -158,6 +162,19 @@ public class WarehouseController { } return success(returnMap); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:warehouse:query')") + public CommonResult> getWarehouseSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = warehouseService.getWarehouseSenior(conditions); + PageResult result = WarehouseConvert.INSTANCE.convertPage(pageResult); + for(WarehouseRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/demo") public WarehouseDO LabelExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java index 61cd6199..9a9d0fb9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java @@ -1,8 +1,12 @@ package com.win.module.wms.controller.work; +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.work.vo.*; + + import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -25,7 +29,7 @@ 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.work.vo.*; + import com.win.module.wms.dal.dataobject.work.WorkDetailDO; import com.win.module.wms.convert.work.WorkDetailConvert; import com.win.module.wms.service.work.WorkDetailService; @@ -91,6 +95,19 @@ public class WorkDetailController { PageResult pageResult = workDetailService.getWorkDetailPage(pageVO); return success(WorkDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产订单子分页") + @PreAuthorize("@ss.hasPermission('wms:workdetail:query')") + public CommonResult> getWorkdetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workDetailService.getWorkDetailSenior(conditions); + PageResult result = WorkDetailConvert.INSTANCE.convertPage(pageResult); + for(WorkDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出生产订单子 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java index 81f3232d..406bdf35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.work; +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.work.vo.*; @@ -10,22 +11,16 @@ 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.work.vo.*; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import com.win.module.wms.convert.work.WorkMainConvert; import com.win.module.wms.service.work.WorkMainService; @@ -91,7 +86,19 @@ public class WorkMainController { PageResult pageResult = workMainService.getWorkMainPage(pageVO); return success(WorkMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:workMain:query')") + public CommonResult> getWorkMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workMainService.getWorkMainSenior(conditions); + PageResult result = WorkMainConvert.INSTANCE.convertPage(pageResult); + for(WorkMainRespVO 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:work-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java index 5e8e3c82..529b3e66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java @@ -1,14 +1,18 @@ package com.win.module.wms.controller.workshop; 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.workshop.vo.WorkshopRespVO; import com.win.module.wms.controller.workshop.vo.*; import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.workshop.WorkshopService; @@ -108,9 +112,27 @@ public class WorkshopController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE); + mapDropDown.put(3, type); + ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas,mapDropDown); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得车间信息分页") + @PreAuthorize("@ss.hasPermission('wms:workshop:query')") + public CommonResult> getWorkshopSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workshopService.getWorkshopSenior(conditions); + PageResult result = WorkshopConvert.INSTANCE.convertPage(pageResult); + for(WorkshopRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get-import-template") @Operation(summary = "获得导入车间板模") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java index c759d444..4da0de9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java @@ -1,14 +1,18 @@ package com.win.module.wms.controller.workstation; 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.workstation.vo.WorkstationRespVO; import com.win.module.wms.controller.workstation.vo.*; import com.win.module.wms.convert.workstation.WorkstationConvert; +import com.win.module.wms.convert.workstation.WorkstationConvert; +import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.workstation.WorkstationService; @@ -93,6 +97,20 @@ public class WorkstationController { PageResult pageResult = workstationService.getWorkstationPage(pageVO); return success(WorkstationConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得工位信息分页") + @PreAuthorize("@ss.hasPermission('wms:workstation:query')") + public CommonResult> getWorkstationSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workstationService.getWorkstationSenior(conditions); + PageResult result = WorkstationConvert.INSTANCE.convertPage(pageResult); + for(WorkstationRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出工位 Excel") @@ -108,7 +126,12 @@ public class WorkstationController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE); + mapDropDown.put(3, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, available); + ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @@ -116,13 +139,14 @@ public class WorkstationController { public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList(); + Map mapDropDown = new HashMap<>(); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE); mapDropDown.put(3, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available); // 输出 - ExcelUtils.write(response, "用户导入模板.xls", "用户列表", WorkstationImportExcelVo.class, list); + ExcelUtils.write(response, "用户导入模板.xls", "用户列表", WorkstationImportExcelVo.class, list,mapDropDown); } @PostMapping("/import") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java index 01c63453..c2ffafd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapJob; 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.productscrapJob.vo.ProductscrapJobDetailExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobDetailDO; @@ -40,7 +42,9 @@ public interface ProductscrapJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java index 940b73d0..8d9d2c2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapJob; 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.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobMainDO; @@ -56,7 +58,9 @@ public interface ProductscrapJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java index 7601ccff..4be7aba7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRecord; 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.productscrapRecord.vo.ProductscrapRecordDetailExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordDetailDO; @@ -47,7 +49,9 @@ public interface ProductscrapRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java index bfe43f59..eeac6578 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRecord; 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.productscrapRecord.vo.ProductscrapRecordMainExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordMainDO; @@ -43,7 +45,9 @@ public interface ProductscrapRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java index b6abb650..b632f0c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRequest; 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.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO; @@ -42,7 +44,9 @@ public interface ProductscrapRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java index fffe5dc9..ce97dd03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRequest; 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.productscrapRequest.vo.ProductscrapRequestMainExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; @@ -41,6 +43,10 @@ public interface ProductscrapRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductscrapRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java index e701c460..49478d77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.project; +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.project.vo.ProjectExportReqVO; import com.win.module.wms.controller.project.vo.ProjectPageReqVO; import com.win.module.wms.dal.dataobject.project.ProjectDO; @@ -32,7 +34,9 @@ public interface ProjectMapper extends BaseMapperX { .eqIfPresent(ProjectDO::getCreator, reqVO.getCreator()) .orderByDesc(ProjectDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProjectExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProjectDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java index 4b43a304..2f2e941a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchase; 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.purchase.vo.PurchaseDetailExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; @@ -49,7 +51,9 @@ public interface PurchaseDetailMapper extends BaseMapperX { .eqIfPresent(PurchaseDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(PurchaseDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseDetailDO::getLineNumber, reqVO.getLineNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java index e3e999ab..9a656835 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchase; 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.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; @@ -42,7 +44,9 @@ public interface PurchaseMainMapper extends BaseMapperX { .eqIfPresent(PurchaseMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(PurchaseMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java index f5abb3f9..9fe8c01a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasePlan; 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.purchasePlan.vo.PurchasePlanDetailExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; @@ -35,7 +37,9 @@ public interface PurchasePlanDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasePlanDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasePlanDetailDO::getPoNumber, reqVO.getPoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java index a636de60..6abd5515 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasePlan; 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.purchasePlan.vo.PurchasePlanMainExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO; @@ -37,7 +39,9 @@ public interface PurchasePlanMainMapper extends BaseMapperX .eqIfPresent(PurchasePlanMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(PurchasePlanMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasePlanMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasePlanMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java index ad64a260..bc898698 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchaseclaimRecord; 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.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordDetailDO; @@ -43,7 +45,9 @@ public interface PurchaseclaimRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseclaimRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseclaimRecordDetailDO::getBatch, reqVO.getBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java index 7bf7c723..ef35bb7a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchaseclaimRecord; 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.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordMainDO; @@ -41,7 +43,9 @@ public interface PurchaseclaimRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseclaimRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseclaimRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java index 5d7d6fbc..d93fdfe2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.purchaseprice; +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.purchaseprice.vo.PurchasepriceExportReqVO; import com.win.module.wms.controller.purchaseprice.vo.PurchasepricePageReqVO; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; @@ -32,7 +34,9 @@ public interface PurchasepriceMapper extends BaseMapperX { .eqIfPresent(PurchasepriceDO::getCreator, reqVO.getCreator()) .orderByDesc(PurchasepriceDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasepriceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasepriceDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java index 7828b5be..86bec0eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptJob; 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.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; import com.win.module.wms.controller.purchasereceiptJob.vo.*; @@ -51,7 +53,9 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java index 9a18319e..4655ec7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptJob; 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.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; import com.win.module.wms.controller.purchasereceiptJob.vo.*; @@ -65,7 +67,9 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java index 125f697c..f188bd31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRecord; 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.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; @@ -67,7 +69,9 @@ public interface PurchasereceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java index cccd9ecf..513786c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRecord; 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.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; @@ -52,7 +54,9 @@ public interface PurchasereceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java index 34c37440..915cb103 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRequest; 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.purchasereceiptRequest.vo.PurchasereceiptRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; @@ -53,7 +55,9 @@ public interface PurchasereceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java index aa91218f..8391f231 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRequest; 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.purchasereceiptRequest.vo.PurchasereceiptRequestMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; @@ -50,7 +52,9 @@ public interface PurchasereceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRequestMainDO::getAsnNumber, reqVO.getAsnNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java index 95fb5f05..09a7847d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnJob; 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.purchasereturnJob.vo.PurchasereturnJobDetailExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO; @@ -46,6 +48,10 @@ public interface PurchasereturnJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PurchasereturnJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java index 527db7e4..6e0d78d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnJob; 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.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; @@ -67,7 +69,9 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java index c2fe4a48..b21cecb5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnRecord; 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.purchasereturnRecord.vo.PurchasereturnRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO; @@ -57,7 +59,9 @@ public interface PurchasereturnRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java index f3dfddf5..2b7aa207 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnRecord; 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.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; @@ -53,7 +55,9 @@ public interface PurchasereturnRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java index 77957a43..911f5552 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnRequest; 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.purchasereturnRequest.vo.PurchasereturnRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestDetailDO; @@ -46,7 +48,9 @@ public interface PurchasereturnRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java index 98562620..d33ce366 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.purchasereturnRequest; 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.purchasereturnRequest.vo.PurchasereturnRequestMainExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainPageReqVO; + import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestMainDO; import org.apache.ibatis.annotations.Mapper; @@ -51,7 +54,9 @@ public interface PurchasereturnRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRequestMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java index e4ff424b..6d090f70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayJob; 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.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; @@ -43,7 +45,9 @@ public interface PutawayJobDetailMapper extends BaseMapperX .eqIfPresent(PutawayJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) .orderByDesc(PutawayJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java index 77c2b315..391ecd49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayJob; 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.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; @@ -60,7 +62,9 @@ public interface PutawayJobMainMapper extends BaseMapperX { .eqIfPresent(PutawayJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(PutawayJobMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java index 58447b42..765dea1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRecord; 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.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; @@ -53,7 +55,9 @@ public interface PutawayRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java index dc0b78bd..9a49604d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRecord; 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.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; @@ -47,6 +49,9 @@ public interface PutawayRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java index ba932087..d99e9a7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRequest; 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.putawayRequest.vo.PutawayRequestDetailExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO; @@ -44,7 +46,9 @@ public interface PutawayRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java index 213b0d51..38c9ff7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRequest; 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.putawayRequest.vo.PutawayRequestMainExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; @@ -52,7 +54,9 @@ public interface PutawayRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRequestMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java index 4015519c..a05ef798 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.recordsetting; +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.recordsetting.vo.RecordsettingExportReqVO; import com.win.module.wms.controller.recordsetting.vo.RecordsettingPageReqVO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; @@ -31,7 +33,9 @@ public interface RecordsettingMapper extends BaseMapperX { .eqIfPresent(RecordsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(RecordsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RecordsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RecordsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java index c97d8b3e..689e851c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshJob; 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.repleinshJob.vo.RepleinshJobDetailExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO; @@ -41,7 +43,9 @@ public interface RepleinshJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java index 692ac427..2fad9e48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshJob; 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.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO; @@ -58,6 +60,9 @@ public interface RepleinshJobMainMapper extends BaseMapperX .eqIfPresent(RepleinshJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(RepleinshJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java index 1124e045..e99eb946 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshRecord; 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.repleinshRecord.vo.RepleinshRecordDetailExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO; @@ -51,7 +53,9 @@ public interface RepleinshRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java index 484cd38d..1ccfcc06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshRecord; 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.repleinshRecord.vo.RepleinshRecordMainExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordMainDO; @@ -45,7 +47,9 @@ public interface RepleinshRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java index 7d05666c..61457b17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshRequest; 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.repleinshRequest.vo.RepleinshRequestDetailExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestDetailDO; @@ -39,7 +41,9 @@ public interface RepleinshRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java index 34ecb9c6..afb5916c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.requestsetting; +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.requestsetting.vo.RequestsettingExportReqVO; import com.win.module.wms.controller.requestsetting.vo.RequestsettingPageReqVO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; @@ -35,7 +37,9 @@ public interface RequestsettingMapper extends BaseMapperX { .eqIfPresent(RequestsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(RequestsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RequestsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RequestsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java index c54de1b9..f4e04e72 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.rule; +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.rule.vo.RulePageReqVO; import com.win.module.wms.dal.dataobject.rule.RuleDO; import org.apache.ibatis.annotations.Mapper; @@ -25,5 +27,7 @@ public interface RuleMapper extends BaseMapperX { .eqIfPresent(RuleDO::getConfiguration, reqVO.getConfiguration()) .orderByDesc(RuleDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java index 62fb261e..a5d93bc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.sale; 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.sale.vo.SaleDetailExportReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailPageReqVO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; @@ -44,6 +46,9 @@ public interface SaleDetailMapper extends BaseMapperX { .eqIfPresent(SaleDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(SaleDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SaleDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java index 7fec83dd..430a3158 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.sale; 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.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; import com.win.module.wms.dal.dataobject.sale.SaleMainDO; @@ -40,7 +42,9 @@ public interface SaleMainMapper extends BaseMapperX { .eqIfPresent(SaleMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(SaleMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SaleMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SaleMainDO::getCustomerCode, reqVO.getCustomerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java index 91ee4123..23b4f383 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.saleprice; +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.saleprice.vo.SalepriceExportReqVO; import com.win.module.wms.controller.saleprice.vo.SalepricePageReqVO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; @@ -36,7 +38,9 @@ public interface SalepriceMapper extends BaseMapperX { .eqIfPresent(SalepriceDO::getCreator, reqVO.getCreator()) .orderByDesc(SalepriceDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SalepriceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SalepriceDO::getCustomerCode, reqVO.getCustomerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java index 66000b50..45131cc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapJob; 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.scrapJob.vo.ScrapJobDetailExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO; @@ -40,7 +42,9 @@ public interface ScrapJobDetailMapper extends BaseMapperX { .eqIfPresent(ScrapJobDetailDO::getCreator, reqVO.getCreator()) .orderByDesc(ScrapJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java index 3552abbe..4b4ee9e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapJob; 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.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobMainDO; @@ -56,6 +58,9 @@ public interface ScrapJobMainMapper extends BaseMapperX { .eqIfPresent(ScrapJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(ScrapJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java index 222fad7f..c47d03ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRecord; 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.scrapRecord.vo.ScrapRecordDetailExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordDetailDO; @@ -47,7 +49,9 @@ public interface ScrapRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java index 75ac9f7f..5270fac2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRecord; 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.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO; @@ -42,7 +44,9 @@ public interface ScrapRecordMainMapper extends BaseMapperX { .eqIfPresent(ScrapRecordMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(ScrapRecordMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java index 42116859..51af448e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRequest; 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.scrapRequest.vo.ScrapRequestDetailExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; @@ -42,7 +44,9 @@ public interface ScrapRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java index 87dece6c..a898082d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRequest; 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.scrapRequest.vo.ScrapRequestMainExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; @@ -40,7 +42,9 @@ public interface ScrapRequestMainMapper extends BaseMapperX .eqIfPresent(ScrapRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) .orderByDesc(ScrapRequestMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java index 0d4f45e1..89f85f3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java @@ -2,13 +2,14 @@ package com.win.module.wms.dal.mysql.shift; 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.shift.vo.ShiftExportReqVO; import com.win.module.wms.controller.shift.vo.ShiftPageReqVO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; -import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import org.apache.ibatis.annotations.Mapper; /** @@ -38,7 +39,9 @@ public interface ShiftMapper extends BaseMapperX { .eqIfPresent(ShiftDO::getAvailable, reqVO.getAvailable()) .orderByDesc(ShiftDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ShiftExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ShiftDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java index d939dd3b..1adc9721 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java @@ -2,13 +2,14 @@ package com.win.module.wms.dal.mysql.stdcostprice; 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.stdcostprice.vo.StdcostpriceExportReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpricePageReqVO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; -import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import org.apache.ibatis.annotations.Mapper; /** @@ -22,6 +23,10 @@ public interface StdcostpriceMapper extends BaseMapperX { default StdcostpriceDO selectByStdcostpriceCode(String suppliercode) { return selectOne( StdcostpriceDO::getSupplierCode,suppliercode); } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(StdcostpricePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(StdcostpriceDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java index 202d7fca..b30bc169 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.strategy; 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.strategy.vo.StrategyExportReqVO; import com.win.module.wms.controller.strategy.vo.StrategyPageReqVO; import com.win.module.wms.dal.dataobject.strategy.StrategyDO; @@ -31,7 +33,9 @@ public interface StrategyMapper extends BaseMapperX { .eqIfPresent(StrategyDO::getIsActive, reqVO.getIsActive()) .orderByDesc(StrategyDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(StrategyExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(StrategyDO::getRemark, reqVO.getRemark()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java index 9a31c627..2b84aec5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java @@ -2,13 +2,14 @@ package com.win.module.wms.dal.mysql.supplier; 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.supplier.vo.SupplierExportReqVO; import com.win.module.wms.controller.supplier.vo.SupplierPageReqVO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; -import com.win.module.wms.dal.dataobject.team.TeamDO; import org.apache.ibatis.annotations.Mapper; /** @@ -46,7 +47,9 @@ public interface SupplierMapper extends BaseMapperX { .eqIfPresent(SupplierDO::getCreator, reqVO.getCreator()) .orderByDesc(SupplierDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java index 900ab694..7fdaf2b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRecord; 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.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; @@ -59,7 +61,9 @@ public interface SupplierdeliverRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java index 3ce4c3c1..bad59f78 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRecord; 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.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; @@ -52,7 +54,9 @@ public interface SupplierdeliverRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java index 27cd0765..189826b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRequest; 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.supplierdeliverRequest.vo.SupplierdeliverRequestDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestDetailDO; @@ -51,7 +53,9 @@ public interface SupplierdeliverRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java index f61dba44..07d3dc9c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRequest; 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.supplierdeliverRequest.vo.SupplierdeliverRequestMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO; @@ -51,7 +53,9 @@ public interface SupplierdeliverRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRequestMainDO::getPpNumber, reqVO.getPpNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java index 59dfd199..930cc27a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRecord; 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.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordDeatilDO; @@ -50,7 +52,9 @@ public interface SupplierinvoiceRecordDeatilMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRecordDeatilExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRecordDeatilDO::getRecordNumber, reqVO.getRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java index 03bde1b3..75c68338 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRecord; 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.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordMainDO; @@ -40,7 +42,9 @@ public interface SupplierinvoiceRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java index e2146599..73755a35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRequest; 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.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestDetailDO; @@ -42,7 +44,9 @@ public interface SupplierinvoiceRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRequestDetailDO::getRecordNumber, reqVO.getRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java index 2f9b8716..ff686946 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRequest; 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.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestMainDO; @@ -39,7 +41,9 @@ public interface SupplierinvoiceRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRequestMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java index d023b283..ec7168d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.supplieritem; +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.supplieritem.vo.SupplieritemExportReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemPageReqVO; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; @@ -21,6 +23,9 @@ public interface SupplieritemMapper extends BaseMapperX { default SupplieritemDO selectBySuppercode(String suppercode) {return selectOne(SupplieritemDO::getSupplierCode, suppercode); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(SupplieritemPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(SupplieritemDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java index 42e858c5..4b450162 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.systemcalendar; +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.systemcalendar.vo.SystemcalendarExportReqVO; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarPageReqVO; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; @@ -31,7 +33,9 @@ public interface SystemcalendarMapper extends BaseMapperX { .eqIfPresent(SystemcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(SystemcalendarDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SystemcalendarExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SystemcalendarDO::getModule, reqVO.getModule()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java index e5831a21..785cec8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java @@ -1,14 +1,13 @@ package com.win.module.wms.dal.mysql.team; - 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.team.vo.TeamExportReqVO; import com.win.module.wms.controller.team.vo.TeamPageReqVO; import com.win.module.wms.dal.dataobject.team.TeamDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import org.apache.ibatis.annotations.Mapper; /** @@ -37,6 +36,12 @@ public interface TeamMapper extends BaseMapperX { .orderByDesc(TeamDO::getId)); } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default List selectList(TeamExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TeamDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java index 68d4827a..7a96c88c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transaction; 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.transaction.vo.TransactionExportReqVO; import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; import com.win.module.wms.dal.dataobject.transaction.TransactionDO; @@ -48,6 +50,9 @@ public interface TransactionMapper extends BaseMapperX { .eqIfPresent(TransactionDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(TransactionDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransactionExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java index 0b545b2a..1563a170 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java @@ -2,14 +2,14 @@ package com.win.module.wms.dal.mysql.transactiontype; 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.transactiontype.vo.TransactiontypeExportReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypePageReqVO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; -import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import org.apache.ibatis.annotations.Mapper; /** @@ -41,6 +41,9 @@ public interface TransactiontypeMapper extends BaseMapperX { .eqIfPresent(TransactiontypeDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(TransactiontypeDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransactiontypeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java index 6e7ef256..46ba1937 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueJob; 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.transferissueJob.vo.TransferissueJobDetailExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO; @@ -41,7 +43,9 @@ public interface TransferissueJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java index d5550ab5..bb895a1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueJob; 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.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; @@ -64,7 +66,9 @@ public interface TransferissueJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java index e7c8febb..4d5de0b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRecord; 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.transferissueRecord.vo.TransferissueRecordDetailExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO; @@ -51,7 +53,9 @@ public interface TransferissueRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueRecordDetailDO::getFromBatch, reqVO.getFromBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java index 25c40253..538b0687 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRecord; 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.transferissueRecord.vo.TransferissueRecordMainExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO; @@ -49,7 +51,9 @@ public interface TransferissueRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java index ab4b47a9..e80795e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRequest; 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.transferissueRequest.vo.TransferissueRequestDetailExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferissueRequestDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferissueRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferissueRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java index 90fe1cd0..62de99a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRequest; 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.transferissueRequest.vo.TransferissueRequestMainExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestMainDO; @@ -18,6 +20,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferissueRequestMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(TransferissueRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferissueRequestMainDO::getCarrierCode, reqVO.getCarrierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java index 948a40ef..736c7f63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferlog; 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.transferlog.vo.TransferlogExportReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogPageReqVO; import com.win.module.wms.dal.dataobject.transferlog.TransferlogDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferlogMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferlogPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferlogDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java index 22dd8899..5ddae0d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptJob; 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.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptJobDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java index dbc99363..2c97c859 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptJob; 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.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptJobMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java index b71b0664..0502b147 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptRecord; 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.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptRecordDetailMapper extends BaseMapperX { + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(TransferreceiptRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRecordDetailDO::getFromBatch, reqVO.getFromBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java index 2365151f..79d7313c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptRecord; 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.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; @@ -18,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptRecordMainMapper extends BaseMapperX { + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java index fcf6d9bb..4bff4633 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptRequest; 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.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptRequestMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRequestMainDO::getCarrierCode, reqVO.getCarrierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java index 48843595..b7172e43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueJob; 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.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueJobDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java index 1aaa0e68..5c1136a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueJob; 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.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobMainDO; @@ -56,7 +58,9 @@ public interface UnplannedissueJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(UnplannedissueJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java index 8fbdb16c..3615ca6e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRecord; 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.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueRecordDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueRecordDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java index 16c57339..09b566f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRecord; 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.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueRecordMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java index cf3bed25..a9c79547 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRequest; 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.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueRequestDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java index f4a0ca86..7beec62a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRequest; 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.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO; @@ -41,6 +43,10 @@ public interface UnplannedissueRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(UnplannedissueRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java index 60db6275..fd8c2fd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptJob; 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.unplannedreceiptJob.vo.UnplannedreceiptJobDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO; @@ -18,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptJobDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default PageResult selectPage(UnplannedreceiptJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java index ee4746de..25af6ece 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptJob; 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.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; @@ -18,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptJobMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default PageResult selectPage(UnplannedreceiptJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java index 951bb4e3..6a85f9f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRecord; 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.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptRecordDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedreceiptRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRecordDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java index 2fd31c12..1d65f952 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRecord; 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.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptRecordMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedreceiptRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java index 33e78d40..a5e62d3b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRequest; 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.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO; @@ -17,7 +19,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UnplannedreceiptRequestDetailMapper extends BaseMapperX { - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(UnplannedreceiptRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java index 3eb51276..86f864ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRequest; 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.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptRequestMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedreceiptRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRequestMainDO::getToWarehouseCode, reqVO.getToWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java index 39c9b0c1..a675b375 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java @@ -2,12 +2,15 @@ package com.win.module.wms.dal.mysql.warehouse; 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.warehouse.vo.WarehouseExportReqVO; import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import org.apache.ibatis.annotations.Mapper; @@ -19,6 +22,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WarehouseMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default WarehouseDO selectByCode(String code) { return selectOne(WarehouseDO::getCode, code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java index 90760dc4..5e618e06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.work; 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.work.vo.WorkDetailExportReqVO; import com.win.module.wms.controller.work.vo.WorkDetailPageReqVO; import com.win.module.wms.dal.dataobject.work.WorkDetailDO; @@ -18,6 +20,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WorkDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(WorkDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(WorkDetailDO::getLineNumber, reqVO.getLineNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java index 3dc2b4b0..1e7983c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.work; 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.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import org.apache.ibatis.annotations.Mapper; @@ -17,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface WorkMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(WorkMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java index 9e1e6ac7..e83b06c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java @@ -2,12 +2,14 @@ package com.win.module.wms.dal.mysql.workshop; 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.workshop.vo.WorkshopExportReqVO; import com.win.module.wms.controller.workshop.vo.WorkshopPageReqVO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +24,10 @@ public interface WorkshopMapper extends BaseMapperX { default WorkshopDO selectByCode(String code) { return selectOne(WorkshopDO::getCode, code); } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(WorkshopPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(WorkshopDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java index 5d9c18ab..a463df12 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java @@ -1,10 +1,14 @@ package com.win.module.wms.dal.mysql.workstation; +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.workstation.vo.WorkstationExportReqVO; import com.win.module.wms.controller.workstation.vo.WorkstationPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +26,10 @@ public interface WorkstationMapper extends BaseMapperX { return selectOne(WorkstationDO::getCode, code); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(WorkstationPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(WorkstationDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java index 4de58dae..dc7eecaa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapJobDetailService { */ Long createProductscrapJobDetail(@Valid ProductscrapJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapJobDetailSenior(CustomConditions conditions); + /** * 更新制品报废任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java index 828eb233..4d89b6f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailPageReqVO; @@ -48,7 +49,10 @@ public class ProductscrapJobDetailServiceImpl implements ProductscrapJobDetailSe ProductscrapJobDetailDO updateObj = ProductscrapJobDetailConvert.INSTANCE.convert(updateReqVO); productscrapJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapJobDetailSenior(CustomConditions conditions) { + return productscrapJobDetailMapper.selectSenior(conditions); + } @Override public void deleteProductscrapJobDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java index 279d1fd3..f192c020 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapJobMainService { */ Long createProductscrapJobMain(@Valid ProductscrapJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapJobMainSenior(CustomConditions conditions); + /** * 更新制品报废任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java index 2338c8f7..d103b80a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.productscrapJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class ProductscrapJobMainServiceImpl implements ProductscrapJobMainServic ProductscrapJobMainDO updateObj = ProductscrapJobMainConvert.INSTANCE.convert(updateReqVO); productscrapJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapJobMainSenior(CustomConditions conditions) { + return productscrapJobMainMapper.selectSenior(conditions); + } @Override public void deleteProductscrapJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java index b12cded9..a279b58e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapRecordDetailService { */ Long createProductscrapRecordDetail(@Valid ProductscrapRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索制品报废记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRecordDetailSenior(CustomConditions conditions); + /** * 更新制品报废记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java index 1ab42236..36b14ec9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class ProductscrapRecordDetailServiceImpl implements ProductscrapRecordDe ProductscrapRecordDetailDO updateObj = ProductscrapRecordDetailConvert.INSTANCE.convert(updateReqVO); productscrapRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapRecordDetailSenior(CustomConditions conditions) { + return productscrapRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteProductscrapRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java index 59b04319..dc972e2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapRecordMainService { */ String createProductscrapRecordMain(@Valid ProductscrapRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索创建制品报废记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRecordMainSenior(CustomConditions conditions); + /** * 更新制品报废记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java index 86774bd8..65c5ece5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class ProductscrapRecordMainServiceImpl implements ProductscrapRecordMain ProductscrapRecordMainDO updateObj = ProductscrapRecordMainConvert.INSTANCE.convert(updateReqVO); productscrapRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapRecordMainSenior(CustomConditions conditions) { + return productscrapRecordMainMapper.selectSenior(conditions); + } @Override public void deleteProductscrapRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java index 3eb0c631..36b612d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; @@ -32,6 +33,14 @@ public interface ProductscrapRequestDetailService { */ void updateProductscrapRequestDetail(@Valid ProductscrapRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索制品报废申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRequestDetailSenior(CustomConditions conditions); + /** * 删除制品报废申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java index 9fa56552..f6858c46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; @@ -56,7 +57,10 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest // 删除 productscrapRequestDetailMapper.deleteById(id); } - + @Override + public PageResult getProductscrapRequestDetailSenior(CustomConditions conditions) { + return productscrapRequestDetailMapper.selectSenior(conditions); + } private void validateProductscrapRequestDetailExists(Long id) { if (productscrapRequestDetailMapper.selectById(id) == null) { throw exception(PRODUCTSCRAP_REQUEST_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java index 1ce2a29f..8382f106 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO; @@ -32,6 +33,14 @@ public interface ProductscrapRequestMainService { */ void updateProductscrapRequestMain(@Valid ProductscrapRequestMainUpdateReqVO updateReqVO); + /** + * 获得用高级搜索制品报废申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRequestMainSenior(CustomConditions conditions); + /** * 删除制品报废申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java index 03724ebe..823a4877 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO; @@ -56,7 +57,10 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa // 删除 productscrapRequestMainMapper.deleteById(id); } - + @Override + public PageResult getProductscrapRequestMainSenior(CustomConditions conditions) { + return productscrapRequestMainMapper.selectSenior(conditions); + } private void validateProductscrapRequestMainExists(Long id) { if (productscrapRequestMainMapper.selectById(id) == null) { throw exception(PRODUCTSCRAP_REQUEST_MAIN_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java index 59a1ec55..7ce3b085 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.project; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.project.vo.*; import com.win.module.wms.dal.dataobject.project.ProjectDO; @@ -29,6 +30,13 @@ public interface ProjectService { * @param updateReqVO 更新信息 */ void updateProject(@Valid ProjectUpdateReqVO updateReqVO); + /** + * 获得用高级搜索项目分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProjectSenior(CustomConditions conditions); /** * 删除项目 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java index c37dfcd8..ca95f896 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.project.vo.*; @@ -44,7 +45,10 @@ public class ProjectServiceImpl implements ProjectService { // 返回 return project.getId(); } - + @Override + public PageResult getProjectSenior(CustomConditions conditions) { + return projectMapper.selectSenior(conditions); + } @Override public void updateProject(ProjectUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java index 5c604488..d7db48b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchase; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseDetailCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchaseDetailService { */ Long createPurchaseDetail(@Valid PurchaseDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购订单子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseDetailSenior(CustomConditions conditions); + /** * 更新采购订单子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java index 9f7e31ae..0053be68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchase; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseDetailCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO; @@ -48,7 +49,10 @@ public class PurchaseDetailServiceImpl implements PurchaseDetailService { PurchaseDetailDO updateObj = PurchaseDetailConvert.INSTANCE.convert(updateReqVO); purchaseDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchaseDetailSenior(CustomConditions conditions) { + return purchaseDetailMapper.selectSenior(conditions); + } @Override public void deletePurchaseDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index da14ac22..6e450520 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchase; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; @@ -26,6 +27,14 @@ public interface PurchaseMainService { */ Long createPurchaseMain(@Valid PurchaseMainCreateReqVO createReqVO); + /** + * 获得用高级搜索采购订单主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseMainSenior(CustomConditions conditions); + /** * 更新采购订单主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index c1648292..226350b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.purchase; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; @@ -44,7 +45,10 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { // 返回 return purchaseMain.getId(); } - + @Override + public PageResult getPurchaseMainSenior(CustomConditions conditions) { + return purchaseMainMapper.selectSenior(conditions); + } @Override public void updatePurchaseMain(PurchaseMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java index ffa7df81..7afb54ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasePlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasePlanDetailService { */ Long createPurchasePlanDetail(@Valid PurchasePlanDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索要货计划子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasePlanDetailSenior(CustomConditions conditions); + /** * 更新要货计划子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java index 693ae555..95420fcf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasePlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO; @@ -48,6 +49,10 @@ public class PurchasePlanDetailServiceImpl implements PurchasePlanDetailService PurchasePlanDetailDO updateObj = PurchasePlanDetailConvert.INSTANCE.convert(updateReqVO); purchasePlanDetailMapper.updateById(updateObj); } + @Override + public PageResult getPurchasePlanDetailSenior(CustomConditions conditions) { + return purchasePlanDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasePlanDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java index 22a86c78..d003f4d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasePlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainPageReqVO; @@ -25,7 +26,13 @@ public interface PurchasePlanMainService { * @return 编号 */ Long createPurchasePlanMain(@Valid PurchasePlanMainCreateReqVO createReqVO); - + /** + * 获得用高级搜索要货计划主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasePlanMainSenior(CustomConditions conditions); /** * 更新要货计划主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index 429fdcd8..2d4ce280 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.purchasePlan; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainPageReqVO; @@ -54,6 +55,10 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { PurchasePlanMainDO updateObj = PurchasePlanMainConvert.INSTANCE.convert(updateReqVO); purchasePlanMainMapper.updateById(updateObj); } + @Override + public PageResult getPurchasePlanMainSenior(CustomConditions conditions) { + return purchasePlanMainMapper.selectSenior(conditions); + } @Override public void deletePurchasePlanMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java index 823ced15..bed74860 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchaseclaimRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchaseclaimRecordDetailService { */ Long createPurchaseclaimRecordDetail(@Valid PurchaseclaimRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购索赔记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseclaimRecordDetailSenior(CustomConditions conditions); + /** * 更新采购索赔记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java index 8802ad52..63637c37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchaseclaimRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; @@ -48,6 +49,10 @@ public class PurchaseclaimRecordDetailServiceImpl implements PurchaseclaimRecord PurchaseclaimRecordDetailDO updateObj = PurchaseclaimRecordDetailConvert.INSTANCE.convert(updateReqVO); purchaseclaimRecordDetailMapper.updateById(updateObj); } + @Override + public PageResult getPurchaseclaimRecordDetailSenior(CustomConditions conditions) { + return purchaseclaimRecordDetailMapper.selectSenior(conditions); + } @Override public void deletePurchaseclaimRecordDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java index 8af2e87c..0e80e8d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchaseclaimRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface PurchaseclaimRecordMainService { */ Long createPurchaseclaimRecordMain(@Valid PurchaseclaimRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseclaimRecordMainSenior(CustomConditions conditions); + /** * 更新采购索赔记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java index 3fc8d3e0..c30fa0eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchaseclaimRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; @@ -48,6 +49,10 @@ public class PurchaseclaimRecordMainServiceImpl implements PurchaseclaimRecordMa PurchaseclaimRecordMainDO updateObj = PurchaseclaimRecordMainConvert.INSTANCE.convert(updateReqVO); purchaseclaimRecordMainMapper.updateById(updateObj); } + @Override + public PageResult getPurchaseclaimRecordMainSenior(CustomConditions conditions) { + return purchaseclaimRecordMainMapper.selectSenior(conditions); + } @Override public void deletePurchaseclaimRecordMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java index 5103bc25..3ef9bf25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.purchaseprice; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchaseprice.vo.*; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; import javax.validation.Valid; @@ -23,6 +25,14 @@ public interface PurchasepriceService { */ Long createPurchaseprice(@Valid PurchasepriceCreateReqVO createReqVO); + /** + * 获得用高级搜索采购价格单分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasepriceSenior(CustomConditions conditions); + /** * 更新采购价格单 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java index b7fe6c97..d73ee5f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.purchaseprice.vo.*; @@ -46,7 +47,10 @@ public class PurchasepriceServiceImpl implements PurchasepriceService { // 返回 return purchaseprice.getId(); } - + @Override + public PageResult getPurchasepriceSenior(CustomConditions conditions) { + return purchasepriceMapper.selectSenior(conditions); + } @Override public void updatePurchaseprice(PurchasepriceUpdateReqVO updateReqVO) { // 校验存在 @@ -93,25 +97,55 @@ public class PurchasepriceServiceImpl implements PurchasepriceService { List errorList = new ArrayList<>(); purchaseprices.forEach(purchaseprice -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validatePurchasepriceForCreateOrUpdate(null,purchaseprice.getSupplierCode(),purchaseprice.getItemCode() - ,purchaseprice.getCurrency(),purchaseprice.getPrice(),purchaseprice.getAvailable()); + String massage = ""; + if(mode != null) { + try { + validatePurchasepriceExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, purchaseprice.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSupplierCodeExists(purchaseprice.getSupplierCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(purchaseprice.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePriceExists(purchaseprice.getPrice()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(purchaseprice.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(purchaseprice); + } + if (errorList == null) { + // 判断如果不存在，在进行插入 + OwnerDO existConfigurationSetting = null; + if (existConfigurationSetting == null && mode != 3) { + purchasepriceMapper.insert(PurchasepriceConvert.INSTANCE.convert(purchaseprice)); + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + PurchasepriceDO purchasepriceDo = PurchasepriceConvert.INSTANCE.convert(purchaseprice); + purchasepriceDo.setId(existConfigurationSetting.getId()); + purchasepriceMapper.updateById(purchasepriceDo); + } + } } - } catch (ServiceException ex) { - errorList.add(purchaseprice); - return; - } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - purchasepriceMapper.insert(PurchasepriceConvert.INSTANCE.convert(purchaseprice)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - PurchasepriceDO purchasepriceDo = PurchasepriceConvert.INSTANCE.convert(purchaseprice); - purchasepriceDo.setId(existConfigurationSetting.getId()); - purchasepriceMapper.updateById(purchasepriceDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java index b2ed0e25..321c8076 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.purchasereceiptJob; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import com.win.framework.common.pojo.PageResult; @@ -20,7 +22,13 @@ public interface PurchasereceiptJobDetailService { * @return 编号 */ Long createPurchasereceiptJobDetail(@Valid PurchasereceiptJobDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索采购收货任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptJobDetailSenior(CustomConditions conditions); /** * 更新采购收货任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java index ed06342a..2c9f1c2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptJob; +import com.win.framework.common.pojo.CustomConditions; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -44,7 +45,10 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe PurchasereceiptJobDetailDO updateObj = PurchasereceiptJobDetailConvert.INSTANCE.convert(updateReqVO); purchasereceiptJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptJobDetailSenior(CustomConditions conditions) { + return purchasereceiptJobDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptJobDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 027e92e6..a99916ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -2,10 +2,11 @@ package com.win.module.wms.service.purchasereceiptJob; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; /** * 采购收货任务主 Service 接口 @@ -21,7 +22,13 @@ public interface PurchasereceiptJobMainService { * @return 编号 */ Long createPurchasereceiptJobMain(@Valid PurchasereceiptJobMainCreateReqVO createReqVO); - + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions); /** * 更新采购收货任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 73398f2c..43cad474 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -1,7 +1,7 @@ package com.win.module.wms.service.purchasereceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; @@ -50,7 +50,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain PurchasereceiptJobMainDO updateObj = PurchasereceiptJobMainConvert.INSTANCE.convert(updateReqVO); purchasereceiptJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions) { + return purchasereceiptJobMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java index bc3da76b..71fbe220 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; @@ -38,7 +39,13 @@ public interface PurchasereceiptRecordDetailService { * @param id 编号 */ void deletePurchasereceiptRecordDetail(Long id); - + /** + * 获得用高级搜索采购收货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRecordDetailSenior(CustomConditions conditions); /** * 获得采购收货记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java index 59b9e2c1..cd5056f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe PurchasereceiptRecordDetailDO updateObj = PurchasereceiptRecordDetailConvert.INSTANCE.convert(updateReqVO); purchasereceiptRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptRecordDetailSenior(CustomConditions conditions) { + return purchasereceiptRecordDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptRecordDetail(Long id) { // 校验存在 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 7e56e8d5..ee054664 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 @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; @@ -32,6 +33,13 @@ public interface PurchasereceiptRecordMainService { * @param updateReqVO 更新信息 */ void updatePurchasereceiptRecordMain(@Valid PurchasereceiptRecordMainUpdateReqVO updateReqVO); + /** + * 获得用高级搜索采购收货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRecordMainSenior(CustomConditions conditions); /** * 删除采购收货记录主 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 61476dfa..9dda87b2 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 @@ -1,6 +1,7 @@ package com.win.module.wms.service.purchasereceiptRecord; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; @@ -68,7 +69,10 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco throw exception(PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS); } } - + @Override + public PageResult getPurchasereceiptRecordMainSenior(CustomConditions conditions) { + return purchasereceiptRecordMainMapper.selectSenior(conditions); + } @Override public PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id) { return purchasereceiptRecordMainMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java index dfedc1e6..cf1a86fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.purchasereceiptRequest; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.framework.common.pojo.PageResult; @@ -20,7 +22,13 @@ public interface PurchasereceiptRequestDetailService { * @return 编号 */ Long createPurchasereceiptRequestDetail(@Valid PurchasereceiptRequestDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRequestDetailSenior(CustomConditions conditions); /** * 更新采购收货申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java index e292f93a..352307fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -35,7 +36,10 @@ public class PurchasereceiptRequestDetailServiceImpl implements PurchasereceiptR // 返回 return purchasereceiptRequestDetail.getId(); } - + @Override + public PageResult getPurchasereceiptRequestDetailSenior(CustomConditions conditions) { + return purchasereceiptRequestDetailMapper.selectSenior(conditions); + } @Override public void updatePurchasereceiptRequestDetail(PurchasereceiptRequestDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java index 1a66a313..968d9eb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasereceiptRequestMainService { */ Long createPurchasereceiptRequestMain(@Valid PurchasereceiptRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRequestMainSenior(CustomConditions conditions); + /** * 更新采购收货申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index fa6dbd03..636b0aa9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq PurchasereceiptRequestMainDO updateObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(updateReqVO); purchasereceiptRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptRequestMainSenior(CustomConditions conditions) { + return purchasereceiptRequestMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java index 0ba64f58..0bebb6a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasereturnJobDetailService { */ String createPurchasereturnJobDetail(@Valid PurchasereturnJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购退货任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnJobDetailSenior(CustomConditions conditions); + /** * 更新采购退货任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java index a35f07ba..98866b0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereturnJobDetailServiceImpl implements PurchasereturnJobDeta PurchasereturnJobDetailDO updateObj = PurchasereturnJobDetailConvert.INSTANCE.convert(updateReqVO); purchasereturnJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereturnJobDetailSenior(CustomConditions conditions) { + return purchasereturnJobDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasereturnJobDetail(String id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index a46b4d44..89d2d170 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; @@ -31,6 +32,13 @@ public interface PurchasereturnJobMainService { * @param updateReqVO 更新信息 */ void updatePurchasereturnJobMain(@Valid PurchasereturnJobMainUpdateReqVO updateReqVO); + /** + * 获得用高级搜索采购退货任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnJobMainSenior(CustomConditions conditions); /** * 删除采购退货任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 55339151..0fd771a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.purchasereturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; @@ -61,7 +61,10 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe // 删除 purchasereturnJobMainMapper.deleteById(id); } - + @Override + public PageResult getPurchasereturnJobMainSenior(CustomConditions conditions) { + return purchasereturnJobMainMapper.selectSenior(conditions); + } private void validatePurchasereturnJobMainExists(String id) { if (purchasereturnJobMainMapper.selectById(id) == null) { throw exception(PURCHASERETURN_JOB_MAIN_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java index 5a420e66..4aec4104 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; @@ -39,6 +40,15 @@ public interface PurchasereturnRecordDetailService { */ void deletePurchasereturnRecordDetail(Long id); + + /** + * 获得用高级搜索采购退货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRecordDetailSenior(CustomConditions conditions); + /** * 获得采购退货记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java index 0945012d..f5f724c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; @@ -72,7 +73,10 @@ public class PurchasereturnRecordDetailServiceImpl implements PurchasereturnReco public List getPurchasereturnRecordDetailList(Collection ids) { return purchasereturnRecordDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getPurchasereturnRecordDetailSenior(CustomConditions conditions) { + return purchasereturnRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getPurchasereturnRecordDetailPage(PurchasereturnRecordDetailPageReqVO pageReqVO) { return purchasereturnRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java index 977bac29..bdc792de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasereturnRecordMainService { */ Long createPurchasereturnRecordMain(@Valid PurchasereturnRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索采购退货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRecordMainSenior(CustomConditions conditions); + /** * 更新采购退货记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java index e10e544b..4ed9f1d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereturnRecordMainServiceImpl implements PurchasereturnRecord PurchasereturnRecordMainDO updateObj = PurchasereturnRecordMainConvert.INSTANCE.convert(updateReqVO); purchasereturnRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereturnRecordMainSenior(CustomConditions conditions) { + return purchasereturnRecordMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereturnRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java index 9ae269a9..6388451a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface PurchasereturnRequestDetailService { * @return 编号 */ Long createPurchasereturnRequestDetail(@Valid PurchasereturnRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购退货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRequestDetailSenior(CustomConditions conditions); /** * 更新采购退货申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java index 1c8719fe..40440075 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailPageReqVO; @@ -57,6 +58,11 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq purchasereturnRequestDetailMapper.deleteById(id); } + @Override + public PageResult getPurchasereturnRequestDetailSenior(CustomConditions conditions) { + return purchasereturnRequestDetailMapper.selectSenior(conditions); + } + private void validatePurchasereturnRequestDetailExists(Long id) { if (purchasereturnRequestDetailMapper.selectById(id) == null) { throw exception(PURCHASERETURN_REQUEST_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java index 689265a3..cbc73432 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainPageReqVO; @@ -24,7 +25,13 @@ public interface PurchasereturnRequestMainService { * @return 编号 */ Long createPurchasereturnRequestMain(@Valid PurchasereturnRequestMainCreateReqVO createReqVO); - + /** + * 获得用高级搜索采购退货申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRequestMainSenior(CustomConditions conditions); /** * 更新采购退货申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 1eb8103c..c88848eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnRequestMainDO updateObj = PurchasereturnRequestMainConvert.INSTANCE.convert(updateReqVO); purchasereturnRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereturnRequestMainSenior(CustomConditions conditions) { + return purchasereturnRequestMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereturnRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java index cfc18396..4e2cbf38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.putawayJob; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; @@ -25,6 +24,15 @@ public interface PutawayJobDetailService { */ Long createPutawayJobDetail(@Valid PutawayJobDetailCreateReqVO createReqVO); + + /** + * 获得用高级搜索上架任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayJobDetailSenior(CustomConditions conditions); + /** * 更新上架任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java index d0c53511..1b5db3fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; @@ -48,7 +49,10 @@ public class PutawayJobDetailServiceImpl implements PutawayJobDetailService { PutawayJobDetailDO updateObj = PutawayJobDetailConvert.INSTANCE.convert(updateReqVO); putawayJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPutawayJobDetailSenior(CustomConditions conditions) { + return putawayJobDetailMapper.selectSenior(conditions); + } @Override public void deletePutawayJobDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index 7c852e8c..c9363131 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; @@ -25,6 +26,14 @@ public interface PutawayJobMainService { */ Long createPutawayJobMain(@Valid PutawayJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayJobMainSenior(CustomConditions conditions); + /** * 更新上架任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 3de7cf41..3fc34132 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.putawayJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -41,7 +41,10 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { // 返回 return putawayJobMain.getId(); } - + @Override + public PageResult getPutawayJobMainSenior(CustomConditions conditions) { + return putawayJobMainMapper.selectSenior(conditions); + } @Override public void updatePutawayJobMain(PutawayJobMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java index 55595421..98d53c4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; @@ -31,7 +32,13 @@ public interface PutawayRecordDetailService { * @param updateReqVO 更新信息 */ void updatePutawayRecordDetail(@Valid PutawayRecordDetailUpdateReqVO updateReqVO); - + /** + * 获得用高级搜索上架记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRecordDetailSenior(CustomConditions conditions); /** * 删除上架记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java index 2d5f0ad6..d4fa3acd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; @@ -82,5 +83,8 @@ public class PutawayRecordDetailServiceImpl implements PutawayRecordDetailServic public List getPutawayRecordDetailList(PutawayRecordDetailExportReqVO exportReqVO) { return putawayRecordDetailMapper.selectList(exportReqVO); } - + @Override + public PageResult getPutawayRecordDetailSenior(CustomConditions conditions) { + return putawayRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java index bf7c75a9..1ad10d4f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; @@ -25,6 +26,15 @@ public interface PutawayRecordMainService { */ Long createPutawayRecordMain(@Valid PutawayRecordMainCreateReqVO createReqVO); + + /** + * 获得用高级搜索上架记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRecordMainSenior(CustomConditions conditions); + /** * 更新上架记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java index 162ceb03..8fd7b30d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; @@ -62,7 +63,10 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService { throw exception(PUTAWAY_RECORD_MAIN_NOT_EXISTS); } } - + @Override + public PageResult getPutawayRecordMainSenior(CustomConditions conditions) { + return putawayRecordMainMapper.selectSenior(conditions); + } @Override public PutawayRecordMainDO getPutawayRecordMain(Long id) { return putawayRecordMainMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java index d563dd49..18db412a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO; @@ -31,6 +32,13 @@ public interface PutawayRequestDetailService { * @param updateReqVO 更新信息 */ void updatePutawayRequestDetail(@Valid PutawayRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索上架申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRequestDetailSenior(CustomConditions conditions); /** * 删除上架申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java index fb8bdcf8..457a59d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailUpdat 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.putawayRequest.PutawayRequestDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert; import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -39,7 +36,10 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ // 返回 return putawayRequestDetail.getId(); } - + @Override + public PageResult getPutawayRequestDetailSenior(CustomConditions conditions) { + return putawayRequestDetailMapper.selectSenior(conditions); + } @Override public void updatePutawayRequestDetail(PutawayRequestDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java index 0739b7f2..ec601c6e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.putawayRequest; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO; @@ -47,6 +46,14 @@ public interface PutawayRequestMainService { */ PutawayRequestMainDO getPutawayRequestMain(Long id); + /** + * 获得用高级搜索上架申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRequestMainSenior(CustomConditions conditions); + /** * 获得上架申请主列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index 5814f5fb..46f34c0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO; @@ -68,6 +69,10 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService return putawayRequestMainMapper.selectById(id); } + @Override + public PageResult getPutawayRequestMainSenior(CustomConditions conditions) { + return putawayRequestMainMapper.selectSenior(conditions); + } @Override public List getPutawayRequestMainList(Collection ids) { return putawayRequestMainMapper.selectBatchIds(ids); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java index 81cd89da..a28f515e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.recordsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.recordsetting.vo.*; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; @@ -30,6 +31,14 @@ public interface RecordsettingService { */ void updateRecordsetting(@Valid RecordsettingUpdateReqVO updateReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRecordsettingSenior(CustomConditions conditions); + /** * 删除记录设置 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.java index 1509dac3..0bc372c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.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.recordsetting.vo.*; @@ -63,6 +64,12 @@ public class RecordsettingServiceImpl implements RecordsettingService { recordsettingMapper.deleteById(id); } + + @Override + public PageResult getRecordsettingSenior(CustomConditions conditions) { + return recordsettingMapper.selectSenior(conditions); + } + @Override public RecordsettingDO getRecordsetting(Long id) { return recordsettingMapper.selectById(id); @@ -91,24 +98,45 @@ public class RecordsettingServiceImpl implements RecordsettingService { List errorList = new ArrayList<>(); recordsettings.forEach(recordsetting -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateRecordsettingForCreateOrUpdate(null,recordsetting.getCode(),recordsetting.getInterfaceType(),recordsetting.getAvailable()); + String massage = ""; + if(mode != null) { + try { + validateRecordsettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, recordsetting.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateInterfaceTypeExists(recordsetting.getInterfaceType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(recordsetting.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(recordsetting); + } + if (errorList == null) { + + // 判断如果不存在，在进行插入 + OwnerDO existConfigurationSetting = null; + if (existConfigurationSetting == null && mode != 3) { + recordsettingMapper.insert(RecordsettingConvert.INSTANCE.convert(recordsetting)); + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + RecordsettingDO recordsettingDo = RecordsettingConvert.INSTANCE.convert(recordsetting); + recordsettingDo.setId(existConfigurationSetting.getId()); + recordsettingMapper.updateById(recordsettingDo); + } + } } - } catch (ServiceException ex) { - errorList.add(recordsetting); - return; - } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - recordsettingMapper.insert(RecordsettingConvert.INSTANCE.convert(recordsetting)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - RecordsettingDO recordsettingDo = RecordsettingConvert.INSTANCE.convert(recordsetting); - recordsettingDo.setId(existConfigurationSetting.getId()); - recordsettingMapper.updateById(recordsettingDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { @@ -123,7 +151,6 @@ public class RecordsettingServiceImpl implements RecordsettingService { validateCodeExists(id,code); validateInterfaceTypeExists(interfaceType); validateAvailableExists(available); - }); } private void validateRecordsettingExists(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java index 36b5e44a..0480296e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface RepleinshJobDetailService { * @return 编号 */ Long createRepleinshJobDetail(@Valid RepleinshJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索补料任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshJobDetailSenior(CustomConditions conditions); /** * 更新补料任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java index 07e3597f..885d8d23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailUpdateReq 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.repleinshJob.RepleinshJobDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.repleinshJob.RepleinshJobDetailConvert; import com.win.module.wms.dal.mysql.repleinshJob.RepleinshJobDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -62,7 +59,10 @@ public class RepleinshJobDetailServiceImpl implements RepleinshJobDetailService throw exception(REPLEINSH_JOB_DETAIL_NOT_EXISTS); } } - + @Override + public PageResult getRepleinshJobDetailSenior(CustomConditions conditions) { + return repleinshJobDetailMapper.selectSenior(conditions); + } @Override public RepleinshJobDetailDO getRepleinshJobDetail(Long id) { return repleinshJobDetailMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java index 7248c847..69ce6e55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; @@ -25,6 +26,15 @@ public interface RepleinshJobMainService { */ Long createRepleinshJobMain(@Valid RepleinshJobMainCreateReqVO createReqVO); + + /** + * 获得用高级搜索补料任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshJobMainSenior(CustomConditions conditions); + /** * 更新补料任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java index 4ce95608..ffd92fca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.repleinshJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -64,6 +64,10 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService { throw exception(REPLEINSH_JOB_MAIN_NOT_EXISTS); } } + @Override + public PageResult getRepleinshJobMainSenior(CustomConditions conditions) { + return repleinshJobMainMapper.selectSenior(conditions); + } @Override public RepleinshJobMainDO getRepleinshJobMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java index 9c74e003..54cbae3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO; @@ -32,6 +33,14 @@ public interface RepleinshRecordDetailService { */ void updateRepleinshRecordDetail(@Valid RepleinshRecordDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRecordDetailSenior(CustomConditions conditions); + /** * 删除补料记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java index 2e4e2066..e370b889 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class RepleinshRecordDetailServiceImpl implements RepleinshRecordDetailSe RepleinshRecordDetailDO updateObj = RepleinshRecordDetailConvert.INSTANCE.convert(updateReqVO); repleinshRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getRepleinshRecordDetailSenior(CustomConditions conditions) { + return repleinshRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteRepleinshRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java index 5a2464b9..2569013b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface RepleinshRecordMainService { * @return 编号 */ Long createRepleinshRecordMain(@Valid RepleinshRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRecordMainSenior(CustomConditions conditions); /** * 更新补料记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java index d1db0028..51cadc5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO; @@ -39,7 +40,10 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic // 返回 return repleinshRecordMain.getId(); } - + @Override + public PageResult getRepleinshRecordMainSenior(CustomConditions conditions) { + return repleinshRecordMainMapper.selectSenior(conditions); + } @Override public void updateRepleinshRecordMain(RepleinshRecordMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java index d82ff9b6..9c3ff69c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailPageReqVO; @@ -24,7 +25,13 @@ public interface RepleinshRequestDetailService { * @return 编号 */ Long createRepleinshRequestDetail(@Valid RepleinshRequestDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索补料申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRequestDetailSenior(CustomConditions conditions); /** * 更新补料申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java index 3ef468bf..a0abfa17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailPageReqVO; @@ -49,6 +50,11 @@ public class RepleinshRequestDetailServiceImpl implements RepleinshRequestDetail repleinshRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getRepleinshRequestDetailSenior(CustomConditions conditions) { + return repleinshRequestDetailMapper.selectSenior(conditions); + } + @Override public void deleteRepleinshRequestDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java index bb4b37be..d3441259 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface RepleinshRequestMainService { * @return 编号 */ Long createRepleinshRequestMain(@Valid RepleinshRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索补料申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRequestMainSenior(CustomConditions conditions); /** * 更新补料申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java index 0803b1df..e2233256 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java @@ -1,9 +1,8 @@ package com.win.module.wms.service.requestsetting; - +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.requestsetting.vo.*; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; - import javax.validation.Valid; import java.util.Collection; import java.util.List; @@ -22,6 +21,13 @@ public interface RequestsettingService { * @return 编号 */ Long createRequestsetting(@Valid RequestsettingCreateReqVO createReqVO); + /** + * 获得用高级搜索申请设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRequestsettingSenior(CustomConditions conditions); /** * 更新申请设置 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.java index 4a3b8c5f..eb409fbb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.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.requestsetting.vo.*; @@ -46,6 +47,10 @@ public class RequestsettingServiceImpl implements RequestsettingService { // 返回 return requestsetting.getId(); } + @Override + public PageResult getRequestsettingSenior(CustomConditions conditions) { + return requestsettingMapper.selectSenior(conditions); + } @Override public void updateRequestsetting(RequestsettingUpdateReqVO updateReqVO) { @@ -93,25 +98,65 @@ public class RequestsettingServiceImpl implements RequestsettingService { List errorList = new ArrayList<>(); requestsettings.forEach(requestsetting -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateRecordsettingForCreateOrUpdate(null,requestsetting.getCode(),requestsetting.getRequestMode(),requestsetting.getAutoCommit() - ,requestsetting.getAutoAgree(),requestsetting.getAutoExecute(),requestsetting.getDirectCreateRecord(),requestsetting.getAvailable()); + + if(mode != null) { + String massage = ""; + try { + validateRequestsettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, requestsetting.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateRequestModeExists(requestsetting.getRequestMode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAutoCommitExists(requestsetting.getAutoCommit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAutoAgreeExists(requestsetting.getAutoAgree()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAutoExecuteExists(requestsetting.getAutoExecute()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDirectCreateRecordExists(requestsetting.getDirectCreateRecord()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(requestsetting.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(requestsetting); + } + if (errorList == null) { + // 判断如果不存在，在进行插入 + OwnerDO existConfigurationSetting = null; + if (existConfigurationSetting == null && mode != 3) { + requestsettingMapper.insert(RequestsettingConvert.INSTANCE.convert(requestsetting)); + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + RequestsettingDO requestsettingDo = RequestsettingConvert.INSTANCE.convert(requestsetting); + requestsettingDo.setId(existConfigurationSetting.getId()); + requestsettingMapper.updateById(requestsettingDo); + } + } } - } catch (ServiceException ex) { - errorList.add(requestsetting); - return; - } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - requestsettingMapper.insert(RequestsettingConvert.INSTANCE.convert(requestsetting)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - RequestsettingDO requestsettingDo = RequestsettingConvert.INSTANCE.convert(requestsetting); - requestsettingDo.setId(existConfigurationSetting.getId()); - requestsettingMapper.updateById(requestsettingDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java index 460cc3bb..f947c9e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.rule; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.rule.vo.RuleCreateReqVO; import com.win.module.wms.controller.rule.vo.RulePageReqVO; @@ -25,6 +26,13 @@ public interface RuleService { * @return 编号 */ Long createRule(@Valid RuleCreateReqVO createReqVO); + /** + * 获得用高级搜索规则分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRuleSenior(CustomConditions conditions); /** * 更新规则 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java index 9877625e..2fc42fc7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; +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.rule.vo.RuleCreateReqVO; @@ -62,6 +63,11 @@ public class RuleServiceImpl implements RuleService { // 删除 ruleMapper.deleteById(id); } + @Override + public PageResult getRuleSenior(CustomConditions conditions) { + return ruleMapper.selectSenior(conditions); + } + @Override public RuleDO getRule(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java index e0113b04..e13d27fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.sale; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleDetailCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailExportReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailPageReqVO; @@ -24,7 +25,13 @@ public interface SaleDetailService { * @return 编号 */ Long createSaleDetail(@Valid SaleDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索销售订单子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSaleDetailSenior(CustomConditions conditions); /** * 更新销售订单子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java index da2b4565..66bf8e1a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.sale; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleDetailCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailExportReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailPageReqVO; @@ -49,6 +50,12 @@ public class SaleDetailServiceImpl implements SaleDetailService { saleDetailMapper.updateById(updateObj); } + @Override + public PageResult getSaleDetailSenior(CustomConditions conditions) { + return saleDetailMapper.selectSenior(conditions); + } + + @Override public void deleteSaleDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java index b0a8b3a7..09dd04d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.sale; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; @@ -25,6 +26,13 @@ public interface SaleMainService { * @return 编号 */ Long createSaleMain(@Valid SaleMainCreateReqVO createReqVO); + /** + * 获得用高级搜索销售订单主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSaleMainSenior(CustomConditions conditions); /** * 更新销售订单主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java index 54800ac1..193d3a68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.sale; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; @@ -43,6 +44,10 @@ public class SaleMainServiceImpl implements SaleMainService { // 返回 return saleMain.getId(); } + @Override + public PageResult getSaleMainSenior(CustomConditions conditions) { + return saleMainMapper.selectSenior(conditions); + } @Override public void updateSaleMain(SaleMainUpdateReqVO updateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java index ec21591c..088f728b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java @@ -3,11 +3,11 @@ package com.win.module.wms.service.saleprice; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.saleprice.vo.SalepriceCreateReqVO; import com.win.module.wms.controller.saleprice.vo.SalepriceExportReqVO; import com.win.module.wms.controller.saleprice.vo.SalepricePageReqVO; import com.win.module.wms.controller.saleprice.vo.*; -import com.win.module.wms.controller.shift.vo.ShiftImportExcelVo; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.framework.common.pojo.PageResult; @@ -25,6 +25,13 @@ public interface SalepriceService { * @return 编号 */ Long createSaleprice(@Valid SalepriceCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSalepriceSenior(CustomConditions conditions); /** * 更新销售价格单 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java index 53a3a9c6..8893a042 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java @@ -5,11 +5,12 @@ 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.saleprice.vo.*; import com.win.module.wms.convert.saleprice.SalepriceConvert; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.module.wms.dal.mysql.saleprice.SalepriceMapper; import org.springframework.stereotype.Service; @@ -46,7 +47,10 @@ public class SalepriceServiceImpl implements SalepriceService { // 返回 return saleprice.getId(); } - + @Override + public PageResult getSalepriceSenior(CustomConditions conditions) { + return salepriceMapper.selectSenior(conditions); + } @Override public void updateSaleprice(SalepriceUpdateReqVO updateReqVO) { // 校验存在 @@ -91,24 +95,55 @@ public class SalepriceServiceImpl implements SalepriceService { List errorList = new ArrayList<>(); saleprices.forEach(saleprice -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; if (mode != null) { - validateSalepriceForCreateOrUpdate(null, saleprice.getCustomerCode(), saleprice.getItemCode(), saleprice.getCurrency(), saleprice.getPrice(), saleprice.getAvailable()); + try { + validateSalepriceExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, saleprice.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCustomerCodeExists(saleprice.getCustomerCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(saleprice.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePriceExists(saleprice.getPrice()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(saleprice.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(saleprice); + } + if (errorList == null) { + + // 判断如果不存在，在进行插入 + SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemCode()); + if (existSaleprice == null && mode != 3) { + salepriceMapper.insert(SalepriceConvert.INSTANCE.convert(saleprice)); + } else if (existSaleprice != null && mode != 2) {// 如果存在，判断是否允许更新 + SalepriceDO salepriceDO = SalepriceConvert.INSTANCE.convert(saleprice); + salepriceDO.setId(existSaleprice.getId()); + salepriceMapper.updateById(salepriceDO); + } + } } - } catch (ServiceException ex) { - errorList.add(saleprice); - return; - } - - // 判断如果不存在，在进行插入 - SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemCode()); - if (existSaleprice == null && mode != 3) { - salepriceMapper.insert(SalepriceConvert.INSTANCE.convert(saleprice)); - } else if (existSaleprice != null && mode != 2) {// 如果存在，判断是否允许更新 - SalepriceDO salepriceDO = SalepriceConvert.INSTANCE.convert(saleprice); - salepriceDO.setId(existSaleprice.getId()); - salepriceMapper.updateById(salepriceDO); - } }); //错误不为空并非部分更新，手工回滚 if (!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java index 290efde0..e7710a21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface ScrapJobDetailService { * @return 编号 */ Long createScrapJobDetail(@Valid ScrapJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索报废出库任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapJobDetailSenior(CustomConditions conditions); /** * 更新报废出库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java index eea95ea6..abc67aae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailPageReqVO; @@ -39,7 +40,10 @@ public class ScrapJobDetailServiceImpl implements ScrapJobDetailService { // 返回 return scrapJobDetail.getId(); } - + @Override + public PageResult getScrapJobDetailSenior(CustomConditions conditions) { + return scrapJobDetailMapper.selectSenior(conditions); + } @Override public void updateScrapJobDetail(ScrapJobDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java index ee4088c5..a9472f91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface ScrapJobMainService { * @return 编号 */ Long createScrapJobMain(@Valid ScrapJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapJobMainSenior(CustomConditions conditions); /** * 更新报废出库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index d1322de0..7a5db239 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.scrapJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -51,6 +51,11 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { scrapJobMainMapper.updateById(updateObj); } + @Override + public PageResult getScrapJobMainSenior(CustomConditions conditions) { + return scrapJobMainMapper.selectSenior(conditions); + } + @Override public void deleteScrapJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java index 77aaeae3..8de8aa83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailPageReqVO; @@ -32,6 +33,14 @@ public interface ScrapRecordDetailService { */ void updateScrapRecordDetail(@Valid ScrapRecordDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索报废出库记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRecordDetailSenior(CustomConditions conditions); + /** * 删除报废出库记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java index b8b23990..dc1aacab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailPageReqVO; @@ -56,7 +57,10 @@ public class ScrapRecordDetailServiceImpl implements ScrapRecordDetailService { // 删除 scrapRecordDetailMapper.deleteById(id); } - + @Override + public PageResult getScrapRecordDetailSenior(CustomConditions conditions) { + return scrapRecordDetailMapper.selectSenior(conditions); + } private void validateScrapRecordDetailExists(Long id) { if (scrapRecordDetailMapper.selectById(id) == null) { throw exception(SCRAP_RECORD_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java index fed450cd..8008cfca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface ScrapRecordMainService { * @return 编号 */ String createScrapRecordMain(@Valid ScrapRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索报废出库记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRecordMainSenior(CustomConditions conditions); /** * 更新报废出库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java index fb1e8c73..ffa916b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; @@ -49,6 +50,11 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { scrapRecordMainMapper.updateById(updateObj); } + @Override + public PageResult getScrapRecordMainSenior(CustomConditions conditions) { + return scrapRecordMainMapper.selectSenior(conditions); + } + @Override public void deleteScrapRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java index d0d98542..805f8262 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.scrapRequest; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailPageReqVO; @@ -31,6 +30,13 @@ public interface ScrapRequestDetailService { * @param updateReqVO 更新信息 */ void updateScrapRequestDetail(@Valid ScrapRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索报废出库申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRequestDetailSenior(CustomConditions conditions); /** * 删除报废出库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java index e4cd2711..ca266e47 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailUpdateReq 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.scrapRequest.ScrapRequestDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; import com.win.module.wms.dal.mysql.scrapRequest.ScrapRequestDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -49,6 +46,11 @@ public class ScrapRequestDetailServiceImpl implements ScrapRequestDetailService scrapRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getScrapRequestDetailSenior(CustomConditions conditions) { + return scrapRequestDetailMapper.selectSenior(conditions); + } + @Override public void deleteScrapRequestDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java index 818e05e1..1803507a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; @@ -25,6 +26,15 @@ public interface ScrapRequestMainService { */ Long createScrapRequestMain(@Valid ScrapRequestMainCreateReqVO createReqVO); + + /** + * 获得用高级搜索报废出库申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRequestMainSenior(CustomConditions conditions); + /** * 更新报废出库申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java index 04a89170..a58af87f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { ScrapRequestMainDO updateObj = ScrapRequestMainConvert.INSTANCE.convert(updateReqVO); scrapRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getScrapRequestMainSenior(CustomConditions conditions) { + return scrapRequestMainMapper.selectSenior(conditions); + } @Override public void deleteScrapRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java index c16d5f6e..9311496c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java @@ -3,8 +3,8 @@ package com.win.module.wms.service.shift; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.shift.vo.*; -import com.win.module.wms.controller.supplier.vo.SupplierImportExcelVo; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.framework.common.pojo.PageResult; @@ -29,6 +29,13 @@ public interface ShiftService { * @param updateReqVO 更新信息 */ void updateShift(@Valid ShiftUpdateReqVO updateReqVO); + /** + * 获得用高级搜索班次分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getShiftSenior(CustomConditions conditions); /** * 删除班次 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java index 6c29f3fc..cd816753 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.shift.vo.*; @@ -63,7 +64,7 @@ public class ShiftServiceImpl implements ShiftService { // 删除 shiftMapper.deleteById(id); } - + @Override public ShiftDO getShift(Long id) { return shiftMapper.selectById(id); @@ -83,7 +84,10 @@ public class ShiftServiceImpl implements ShiftService { public List getShiftList(ShiftExportReqVO exportReqVO) { return shiftMapper.selectList(exportReqVO); } - + @Override + public PageResult getShiftSenior(CustomConditions conditions) { + return shiftMapper.selectSenior(conditions); + } public List importShiftList(List shifts, Integer mode, boolean updatePart) { @@ -93,26 +97,55 @@ public class ShiftServiceImpl implements ShiftService { List errorList = new ArrayList<>(); shifts.forEach(shift -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateShiftForCreateOrUpdate(null,shift.getCode(),shift.getBeginTime(),shift.getEntTime(),shift.getEndAtNextDay(), - shift.getAvailable()); + String massage = ""; + if(mode != null) { + try { + validateShiftExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, shift.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateBeginTimeExists(shift.getBeginTime()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateEndTimeExists(shift.getEntTime()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateEndatnextDayExists(shift.getEndAtNextDay()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(shift.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(shift); + } + if (errorList == null) { + + // 判断如果不存在，在进行插入 + ShiftDO existShift = shiftMapper.selectByCode(shift.getCode()); + if (existShift == null && mode != 3) { + shiftMapper.insert(ShiftConvert.INSTANCE.convert(shift)); + } else if (existShift != null && mode != 2) {// 如果存在，判断是否允许更新 + ShiftDO shiftDO = ShiftConvert.INSTANCE.convert(shift); + shiftDO.setId(existShift.getId()); + shiftMapper.updateById(shiftDO); + } + } } - } catch (ServiceException ex) { - errorList.add(shift); - return; - } - - // 判断如果不存在，在进行插入 - ShiftDO existShift = shiftMapper.selectByCode(shift.getCode()); - if (existShift == null&& mode != 3) { - shiftMapper.insert(ShiftConvert.INSTANCE.convert(shift)); - } - else if (existShift != null && mode != 2) {// 如果存在，判断是否允许更新 - ShiftDO shiftDO = ShiftConvert.INSTANCE.convert(shift); - shiftDO.setId(existShift.getId()); - shiftMapper.updateById(shiftDO); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java index 8a71b52e..87b28e71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.stdcostprice; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.stdcostprice.vo.*; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceExportReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpricePageReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceUpdateReqVO; -import com.win.module.wms.controller.supplier.vo.SupplierImportExcelVo; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import javax.validation.Valid; @@ -26,6 +26,13 @@ public interface StdcostpriceService { * @return 编号 */ Long createStdcostprice(@Valid StdcostpriceCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getStdcostpriceSenior(CustomConditions conditions); /** * 更新标准成本价格单 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java index 1a6f09b5..8bcefb5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java @@ -5,11 +5,11 @@ 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.stdcostprice.vo.*; import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import com.win.module.wms.dal.mysql.stdcostprice.StdcostpriceMapper; import org.springframework.stereotype.Service; @@ -48,6 +48,12 @@ public class StdcostpriceServiceImpl implements StdcostpriceService { return stdcostprice.getId(); } + @Override + public PageResult getStdcostpriceSenior(CustomConditions conditions) { + return stdcostpriceMapper.selectSenior(conditions); + } + + @Override public void updateStdcostprice(StdcostpriceUpdateReqVO updateReqVO) { // 校验存在 @@ -92,25 +98,56 @@ public class StdcostpriceServiceImpl implements StdcostpriceService { List errorList = new ArrayList<>(); stdcostprices.forEach(stdcostprice -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; if(mode != null){ - validateStdcostpriceForCreateOrUpdate(null,stdcostprice.getSupplierCode(),stdcostprice.getItemCode(), - stdcostprice.getCurrency(),stdcostprice.getPrice(),stdcostprice.getAvailable()); - } - } catch (ServiceException ex) { + try { + validateStdcostpriceExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,stdcostprice.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSuppercodeExists(stdcostprice.getSupplierCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(stdcostprice.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePriceExists(stdcostprice.getPrice()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(stdcostprice.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(stdcostprice); - return; } + if(errorList == null) { - // 判断如果不存在，在进行插入 - StdcostpriceDO existStdcostprice = stdcostpriceMapper.selectByStdcostpriceCode(stdcostprice.getSupplierCode()); - if (existStdcostprice == null&& mode != 3) { - stdcostpriceMapper.insert(StdcostpriceConvert.INSTANCE.convert(stdcostprice)); - } - else if (existStdcostprice != null && mode != 2) {// 如果存在，判断是否允许更新 - StdcostpriceDO stdcostpriceDO = StdcostpriceConvert.INSTANCE.convert(stdcostprice); - stdcostpriceDO.setId(existStdcostprice.getId()); - stdcostpriceMapper.updateById(stdcostpriceDO); + // 判断如果不存在，在进行插入 + StdcostpriceDO existStdcostprice = stdcostpriceMapper.selectByStdcostpriceCode(stdcostprice.getSupplierCode()); + if (existStdcostprice == null && mode != 3) { + stdcostpriceMapper.insert(StdcostpriceConvert.INSTANCE.convert(stdcostprice)); + } else if (existStdcostprice != null && mode != 2) {// 如果存在，判断是否允许更新 + StdcostpriceDO stdcostpriceDO = StdcostpriceConvert.INSTANCE.convert(stdcostprice); + stdcostpriceDO.setId(existStdcostprice.getId()); + stdcostpriceMapper.updateById(stdcostpriceDO); + + } + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java index f3aafa37..b800d182 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.strategy; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.strategy.vo.StrategyCreateReqVO; import com.win.module.wms.controller.strategy.vo.StrategyExportReqVO; import com.win.module.wms.controller.strategy.vo.StrategyPageReqVO; @@ -25,6 +26,14 @@ public interface StrategyService { */ Long createStrategy(@Valid StrategyCreateReqVO createReqVO); + /** + * 获得用高级搜索策略分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getStrategySenior(CustomConditions conditions); + /** * 更新策略 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java index fc3d75ee..8cc53121 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.strategy; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.strategy.vo.StrategyCreateReqVO; import com.win.module.wms.controller.strategy.vo.StrategyExportReqVO; @@ -38,6 +39,11 @@ public class StrategyServiceImpl implements StrategyService { // 返回 return strategy.getId(); } + @Override + public PageResult getStrategySenior(CustomConditions conditions) { + return strategyMapper.selectSenior(conditions); + } + @Override public void updateStrategy(StrategyUpdateReqVO updateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 22de4b9b..4d968825 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.supplier; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplier.vo.*; import com.win.module.wms.controller.supplier.vo.SupplierImportExcelVo; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; @@ -22,6 +21,13 @@ public interface SupplierService { * @return 编号 */ Long createSupplier(@Valid SupplierCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierSenior(CustomConditions conditions); /** * 更新供应商 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index 9432b35b..f8c5a2ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.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.supplier.vo.*; @@ -53,7 +54,10 @@ public class SupplierServiceImpl implements SupplierService { SupplierDO updateObj = SupplierConvert.INSTANCE.convert(updateReqVO); supplierMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierSenior(CustomConditions conditions) { + return supplierMapper.selectSenior(conditions); + } @Override public void deleteSupplier(Long id) { // 校验存在 @@ -89,25 +93,45 @@ public class SupplierServiceImpl implements SupplierService { List errorList = new ArrayList<>(); suppliers.forEach(supplier -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateSupplierForCreateOrUpdate(null,supplier.getCode(),supplier.getShortName(),supplier.getAvailable()); + String massage = ""; + if (mode != null) { + try { + validateSupplierExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, supplier.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateShortnameExists(supplier.getShortName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(supplier.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { - errorList.add(supplier); - return; - } - // 判断如果不存在，在进行插入 - SupplierDO existSupplier = supplierMapper.selectByCode(supplier.getCode()); - if (existSupplier == null&& mode != 3) { - supplierMapper.insert(SupplierConvert.INSTANCE.convert(supplier)); + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(supplier); } - else if (existSupplier != null && mode != 2) {// 如果存在，判断是否允许更新 - SupplierDO supplierDO = SupplierConvert.INSTANCE.convert(supplier); - supplierDO.setId(existSupplier.getId()); - supplierMapper.updateById(supplierDO); + if (errorList == null) { + // 判断如果不存在，在进行插入 + SupplierDO existSupplier = supplierMapper.selectByCode(supplier.getCode()); + if (existSupplier == null && mode != 3) { + supplierMapper.insert(SupplierConvert.INSTANCE.convert(supplier)); + } else if (existSupplier != null && mode != 2) {// 如果存在，判断是否允许更新 + SupplierDO supplierDO = SupplierConvert.INSTANCE.convert(supplier); + supplierDO.setId(existSupplier.getId()); + supplierMapper.updateById(supplierDO); + } } + } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java index 1f5fd95b..113612c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.supplierdeliverRecord; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; @@ -25,6 +24,14 @@ public interface SupplierdeliverRecordDetailService { */ Long createSupplierdeliverRecordDetail(@Valid SupplierdeliverRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRecordDetailSenior(CustomConditions conditions); + /** * 更新供应商发货记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java index ebe24379..3522238a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.supplierdeliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailUpdateReqVO; + import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -48,7 +50,10 @@ public class SupplierdeliverRecordDetailServiceImpl implements SupplierdeliverRe SupplierdeliverRecordDetailDO updateObj = SupplierdeliverRecordDetailConvert.INSTANCE.convert(updateReqVO); supplierdeliverRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierdeliverRecordDetailSenior(CustomConditions conditions) { + return supplierdeliverRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index 23f71f79..43270b01 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierdeliverRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; @@ -25,6 +26,13 @@ public interface SupplierdeliverRecordMainService { * @return 编号 */ Long createSupplierdeliverRecordMain(@Valid SupplierdeliverRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRecordMainSenior(CustomConditions conditions); /** * 更新供应商发货记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index df36e7fc..b733d7ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.supplierdeliverRecord; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; @@ -53,7 +54,10 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco SupplierdeliverRecordMainDO updateObj = SupplierdeliverRecordMainConvert.INSTANCE.convert(updateReqVO); supplierdeliverRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierdeliverRecordMainSenior(CustomConditions conditions) { + return supplierdeliverRecordMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java index 23f9e270..3c2a2792 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.supplierdeliverRequest; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailPageReqVO; @@ -24,6 +23,13 @@ public interface SupplierdeliverRequestDetailService { * @return 编号 */ Long createSupplierdeliverRequestDetail(@Valid SupplierdeliverRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRequestDetailSenior(CustomConditions conditions); /** * 更新供应商发货申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java index 89fc80e8..e8088c77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierdeliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailPageReqVO; @@ -48,6 +49,10 @@ public class SupplierdeliverRequestDetailServiceImpl implements SupplierdeliverR SupplierdeliverRequestDetailDO updateObj = SupplierdeliverRequestDetailConvert.INSTANCE.convert(updateReqVO); supplierdeliverRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getSupplierdeliverRequestDetailSenior(CustomConditions conditions) { + return supplierdeliverRequestDetailMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRequestDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java index f2c53db3..3707dfff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierdeliverRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierdeliverRequestMainService { * @return 编号 */ Long createSupplierdeliverRequestMain(@Valid SupplierdeliverRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRequestMainSenior(CustomConditions conditions); /** * 更新供应商发货申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index 3a2370df..7d904fbf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierdeliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq SupplierdeliverRequestMainDO updateObj = SupplierdeliverRequestMainConvert.INSTANCE.convert(updateReqVO); supplierdeliverRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierdeliverRequestMainSenior(CustomConditions conditions) { + return supplierdeliverRequestMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java index 0cd2feb8..f516e72c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilPageReqVO; @@ -25,6 +26,14 @@ public interface SupplierinvoiceRecordDeatilService { */ Long createSupplierinvoiceRecordDeatil(@Valid SupplierinvoiceRecordDeatilCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发票记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRecordDeatilSenior(CustomConditions conditions); + /** * 更新供应商发票记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java index 94012125..3791a43b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRec 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.supplierinvoiceRecord.SupplierinvoiceRecordDeatilDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.supplierinvoiceRecord.SupplierinvoiceRecordDeatilConvert; import com.win.module.wms.dal.mysql.supplierinvoiceRecord.SupplierinvoiceRecordDeatilMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -48,7 +45,10 @@ public class SupplierinvoiceRecordDeatilServiceImpl implements SupplierinvoiceRe SupplierinvoiceRecordDeatilDO updateObj = SupplierinvoiceRecordDeatilConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRecordDeatilMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierinvoiceRecordDeatilSenior(CustomConditions conditions) { + return supplierinvoiceRecordDeatilMapper.selectSenior(conditions); + } @Override public void deleteSupplierinvoiceRecordDeatil(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java index 68068be8..9e113464 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierinvoiceRecordMainService { * @return 编号 */ Long createSupplierinvoiceRecordMain(@Valid SupplierinvoiceRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRecordMainSenior(CustomConditions conditions); /** * 更新供应商发票记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java index c7eadd77..5b6d4b18 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class SupplierinvoiceRecordMainServiceImpl implements SupplierinvoiceReco SupplierinvoiceRecordMainDO updateObj = SupplierinvoiceRecordMainConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierinvoiceRecordMainSenior(CustomConditions conditions) { + return supplierinvoiceRecordMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierinvoiceRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java index d4aaabb6..d53c232b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierinvoiceRequestDetailService { * @return 编号 */ Long createSupplierinvoiceRequestDetail(@Valid SupplierinvoiceRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发票申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRequestDetailSenior(CustomConditions conditions); /** * 更新供应商发票申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java index 959d693f..d785aa48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailPageReqVO; @@ -77,6 +78,10 @@ public class SupplierinvoiceRequestDetailServiceImpl implements SupplierinvoiceR public PageResult getSupplierinvoiceRequestDetailPage(SupplierinvoiceRequestDetailPageReqVO pageReqVO) { return supplierinvoiceRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getSupplierinvoiceRequestDetailSenior(CustomConditions conditions) { + return supplierinvoiceRequestDetailMapper.selectSenior(conditions); + } @Override public List getSupplierinvoiceRequestDetailList(SupplierinvoiceRequestDetailExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java index d59225b9..eebef71d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierinvoiceRequestMainService { * @return 编号 */ Long createSupplierinvoiceRequestMain(@Valid SupplierinvoiceRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRequestMainSenior(CustomConditions conditions); /** * 更新供应商发票申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java index 755b832e..32d35a10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; @@ -48,6 +49,10 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq SupplierinvoiceRequestMainDO updateObj = SupplierinvoiceRequestMainConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRequestMainMapper.updateById(updateObj); } + @Override + public PageResult getSupplierinvoiceRequestMainSenior(CustomConditions conditions) { + return supplierinvoiceRequestMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierinvoiceRequestMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java index 8c19d6e9..3d3320c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplieritem; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplieritem.vo.SupplieritemCreateReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemExportReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemPageReqVO; @@ -26,6 +27,14 @@ public interface SupplieritemService { */ Long createSupplieritem(@Valid SupplieritemCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商物品分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplieritemSenior(CustomConditions conditions); + /** * 更新供应商物品 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java index 14d88033..61c4c3a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.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.supplieritem.vo.*; @@ -59,7 +60,10 @@ public class SupplieritemServiceImpl implements SupplieritemService { SupplieritemDO updateObj = SupplieritemConvert.INSTANCE.convert(updateReqVO); supplieritemMapper.updateById(updateObj); } - + @Override + public PageResult getSupplieritemSenior(CustomConditions conditions) { + return supplieritemMapper.selectSenior(conditions); + } @Override public void deleteSupplieritem(Long id) { // 校验存在 @@ -95,15 +99,40 @@ public class SupplieritemServiceImpl implements SupplieritemService { List errorList = new ArrayList<>(); supplieriteams.forEach(supplieriteam -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; if(mode != null){ - validateSupplieriteamForCreateOrUpdate(null,supplieriteam.getSupplierCode(), - supplieriteam.getItemCode(),supplieriteam.getPackUnit(),supplieriteam.getPackQty(),supplieriteam.getAvailable()); + try { + validateSupplieritemExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemCodeExists(null,supplieriteam.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSupperCodeExists(supplieriteam.getSupplierCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackunitExists(supplieriteam.getPackUnit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackQtyExists(supplieriteam.getPackQty()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(supplieriteam.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - } catch (ServiceException ex) { - errorList.add(supplieriteam); - return; - } + // 判断如果不存在，在进行插入 SupplieritemDO existSupplieriteam = supplieritemMapper.selectBySuppercode(supplieriteam.getSupplierCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java index 9823b6c2..35516d41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java @@ -3,8 +3,8 @@ package com.win.module.wms.service.systemcalendar; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.systemcalendar.vo.*; -import com.win.module.wms.controller.team.vo.TeamImportExcelVo; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import com.win.framework.common.pojo.PageResult; @@ -29,6 +29,13 @@ public interface SystemcalendarService { * @param updateReqVO 更新信息 */ void updateSystemcalendar(@Valid SystemcalendarUpdateReqVO updateReqVO); + /** + * 获得用高级搜索系统日历分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSystemcalendarSenior(CustomConditions conditions); /** * 删除系统日历 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java index 44f9efa3..de419b03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.systemcalendar; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; 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.systemcalendar.vo.*; @@ -50,7 +52,10 @@ public class SystemcalendarServiceImpl implements SystemcalendarService { SystemcalendarDO updateObj = SystemcalendarConvert.INSTANCE.convert(updateReqVO); systemcalendarMapper.updateById(updateObj); } - + @Override + public PageResult getSystemcalendarSenior(CustomConditions conditions) { + return systemcalendarMapper.selectSenior(conditions); + } @Override public void deleteSystemcalendar(Long id) { // 校验存在 @@ -85,25 +90,41 @@ public class SystemcalendarServiceImpl implements SystemcalendarService { List errorList = new ArrayList<>(); systemcalendars.forEach(systemcalendar -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateSystemcalendarForCreateOrUpdate(null,systemcalendar.getModule(),systemcalendar.getAvailable()); + String massage = ""; + if (mode != null) { + try { + validateSystemcalendarExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { - errorList.add(systemcalendar); - return; - } - // 判断如果不存在，在进行插入 - SystemcalendarDO existSystemcalendar = null; - if (existSystemcalendar == null&& mode != 3) { - systemcalendarMapper.insert(SystemcalendarConvert.INSTANCE.convert(systemcalendar)); - } - else if (existSystemcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - SystemcalendarDO systemcalendarDO = SystemcalendarConvert.INSTANCE.convert(systemcalendar); - systemcalendarDO.setId(existSystemcalendar.getId()); - systemcalendarMapper.updateById(systemcalendarDO); + try { + validateMoubleExists(systemcalendar.getModule()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(systemcalendar.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(systemcalendar); + } + if (errorList == null) { + // 判断如果不存在，在进行插入 + SystemcalendarDO existSystemcalendar = null; + if (existSystemcalendar == null && mode != 3) { + systemcalendarMapper.insert(SystemcalendarConvert.INSTANCE.convert(systemcalendar)); + } else if (existSystemcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + SystemcalendarDO systemcalendarDO = SystemcalendarConvert.INSTANCE.convert(systemcalendar); + systemcalendarDO.setId(existSystemcalendar.getId()); + systemcalendarMapper.updateById(systemcalendarDO); + } + } } + }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java index 24ffa395..6c6e7ecf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java @@ -3,12 +3,12 @@ package com.win.module.wms.service.team; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.team.vo.TeamCreateReqVO; import com.win.module.wms.controller.team.vo.TeamExportReqVO; import com.win.module.wms.controller.team.vo.TeamPageReqVO; import com.win.module.wms.controller.team.vo.TeamUpdateReqVO; import com.win.module.wms.controller.team.vo.TeamImportExcelVo; -import com.win.module.wms.controller.transactiontype.vo.TransactiontypeImportExcelVo; import com.win.module.wms.dal.dataobject.team.TeamDO; import com.win.framework.common.pojo.PageResult; @@ -27,6 +27,14 @@ public interface TeamService { */ Long createTeam(@Valid TeamCreateReqVO createReqVO); + /** + * 获得用高级搜索信息分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTeamSenior(CustomConditions conditions); + /** * 更新班组 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java index 1a710634..6005192a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.team.vo.*; @@ -53,6 +54,11 @@ public class TeamServiceImpl implements TeamService { teamMapper.updateById(updateObj); } + @Override + public PageResult getTeamSenior(CustomConditions conditions) { + return teamMapper.selectSenior(conditions); + } + @Override public void deleteTeam(Long id) { // 校验存在 @@ -88,26 +94,44 @@ public class TeamServiceImpl implements TeamService { List errorList = new ArrayList<>(); teams.forEach(team -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateTeamForCreateOrUpdate(null,team.getCode(),team.getAvailable()); + String massage = ""; + + if(mode != null) { + try { + validateTeamExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, team.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(team.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(team); + } + + if (errorList == null) { + // 判断如果不存在，在进行插入 + TeamDO existTeam = teamMapper.selectByCode(team.getCode()); + if (existTeam == null && mode != 3) { + teamMapper.insert(TeamConvert.INSTANCE.convert(team)); + } else if (existTeam != null && mode != 2) {// 如果存在，判断是否允许更新 + TeamDO teamDO = TeamConvert.INSTANCE.convert(team); + teamDO.setId(existTeam.getId()); + teamMapper.updateById(teamDO); + } + } } - } catch (ServiceException ex) { - errorList.add(team); - return; - } - - // 判断如果不存在，在进行插入 - TeamDO existTeam = teamMapper.selectByCode(team.getCode()); - if (existTeam == null&& mode != 3) { - teamMapper.insert(TeamConvert.INSTANCE.convert(team)); - } - else if (existTeam != null && mode != 2) {// 如果存在，判断是否允许更新 - TeamDO teamDO = TeamConvert.INSTANCE.convert(team); - teamDO.setId(existTeam.getId()); - teamMapper.updateById(teamDO); - } }); + //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java index c8d73424..e341038e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transaction; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionExportReqVO; import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; @@ -24,6 +25,13 @@ public interface TransactionService { * @return 编号 */ String createTransaction(@Valid TransactionCreateReqVO createReqVO); + /** + * 获得用高级搜索库存事务分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransactionSenior(CustomConditions conditions); /** * 更新库存事务 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java index 0a14e4c0..9b8a072f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transaction; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionExportReqVO; import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; @@ -48,7 +49,10 @@ public class TransactionServiceImpl implements TransactionService { TransactionDO updateObj = TransactionConvert.INSTANCE.convert(updateReqVO); transactionMapper.updateById(updateObj); } - + @Override + public PageResult getTransactionSenior(CustomConditions conditions) { + return transactionMapper.selectSenior(conditions); + } @Override public void deleteTransaction(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java index 341c7b8d..73d9a8f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java @@ -3,13 +3,12 @@ package com.win.module.wms.service.transactiontype; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeCreateReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeExportReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypePageReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeUpdateReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeImportExcelVo; -import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; -import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.framework.common.pojo.PageResult; @@ -27,7 +26,13 @@ public interface TransactiontypeService { * @return 编号 */ Long createTransactiontype(@Valid TransactiontypeCreateReqVO createReqVO); - + /** + * 获得用高级搜索事务类型分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransactiontypeSenior(CustomConditions conditions); /** * 更新事务类型 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java index bc3c57c0..93abf8ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.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.transactiontype.vo.*; @@ -54,7 +55,10 @@ public class TransactiontypeServiceImpl implements TransactiontypeService { TransactiontypeDO updateObj = TransactiontypeConvert.INSTANCE.convert(updateReqVO); transactiontypeMapper.updateById(updateObj); } - + @Override + public PageResult getTransactiontypeSenior(CustomConditions conditions) { + return transactiontypeMapper.selectSenior(conditions); + } @Override public void deleteTransactiontype(Long id) { // 校验存在 @@ -88,27 +92,47 @@ public class TransactiontypeServiceImpl implements TransactiontypeService { } List errorList = new ArrayList<>(); transactiontypes.forEach(transactiontype -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateTransactiontypeForCreateOrUpdate(null,transactiontype.getCode(),transactiontype.getAvailable()); - } - } catch (ServiceException ex) { - errorList.add(transactiontype); - return; - } - - // 判断如果不存在，在进行插入 - TransactiontypeDO existTransactiontype = transactiontypeMapper.selectByCode(transactiontype.getCode()); - if (existTransactiontype == null&& mode != 3) { - transactiontypeMapper.insert(TransactiontypeConvert.INSTANCE.convert(transactiontype)); - } - else if (existTransactiontype != null && mode != 2) {// 如果存在，判断是否允许更新 - TransactiontypeDO transactiontypeDO = TransactiontypeConvert.INSTANCE.convert(transactiontype); - transactiontypeDO.setId(existTransactiontype.getId()); - transactiontypeMapper.updateById(transactiontypeDO); - } - }); + if(mode != null) { + try { + validateTransactiontypeExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, transactiontype.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(transactiontype.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(transactiontype); + } + // 判断如果不存在，在进行插入 + TransactiontypeDO existTransactiontype = transactiontypeMapper.selectByCode(transactiontype.getCode()); + if (errorList == null) { + if (existTransactiontype == null && mode != 3) { + transactiontypeMapper.insert(TransactiontypeConvert.INSTANCE.convert(transactiontype)); + } else if (existTransactiontype != null && mode != 2) {// 如果存在，判断是否允许更新 + TransactiontypeDO transactiontypeDO = TransactiontypeConvert.INSTANCE.convert(transactiontype); + transactiontypeDO.setId(existTransactiontype.getId()); + transactiontypeMapper.updateById(transactiontypeDO); + } + } + } + + + + }); + //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java index 814ed2a3..62c0f47d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO; @@ -25,6 +26,14 @@ public interface TransferissueJobDetailService { */ Long createTransferissueJobDetail(@Valid TransferissueJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨出库任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueJobDetailSenior(CustomConditions conditions); + /** * 更新调拨出库任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java index 3d61d435..6d27e024 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO; @@ -48,6 +49,10 @@ public class TransferissueJobDetailServiceImpl implements TransferissueJobDetail TransferissueJobDetailDO updateObj = TransferissueJobDetailConvert.INSTANCE.convert(updateReqVO); transferissueJobDetailMapper.updateById(updateObj); } + @Override + public PageResult getTransferissueJobDetailSenior(CustomConditions conditions) { + return transferissueJobDetailMapper.selectSenior(conditions); + } @Override public void deleteTransferissueJobDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 99b2b52b..0d0817c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferissueJobMainService { * @return 编号 */ Long createTransferissueJobMain(@Valid TransferissueJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueJobMainSenior(CustomConditions conditions); /** * 更新调拨出库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 7b01caf0..5ead2f1a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.transferissueJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ TransferissueJobMainDO updateObj = TransferissueJobMainConvert.INSTANCE.convert(updateReqVO); transferissueJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferissueJobMainSenior(CustomConditions conditions) { + return transferissueJobMainMapper.selectSenior(conditions); + } @Override public void deleteTransferissueJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java index 2b4b2fc1..3c0ef1d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO; @@ -25,6 +26,13 @@ public interface TransferissueRecordDetailService { */ String createTransferissueRecordDetail(@Valid TransferissueRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRequestDetailSenior(CustomConditions conditions); /** * 更新调拨出库记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java index 0f35825d..0e08dddc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class TransferissueRecordDetailServiceImpl implements TransferissueRecord TransferissueRecordDetailDO updateObj = TransferissueRecordDetailConvert.INSTANCE.convert(updateReqVO); transferissueRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getTransferissueRequestDetailSenior(CustomConditions conditions) { + return transferissueRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteTransferissueRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java index 28ebc359..e1a7bffe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferissueRecordMainService { * @return 编号 */ Long createTransferissueRecordMain(@Valid TransferissueRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨出库记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRecordMainSenior(CustomConditions conditions); /** * 更新调拨出库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java index 52a81103..d8f5b95a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa TransferissueRecordMainDO updateObj = TransferissueRecordMainConvert.INSTANCE.convert(updateReqVO); transferissueRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferissueRecordMainSenior(CustomConditions conditions) { + return transferissueRecordMainMapper.selectSenior(conditions); + } @Override public void deleteTransferissueRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java index 03adfcd3..e8b5329a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO; @@ -25,6 +26,15 @@ public interface TransferissueRequestDetailService { */ Long createTransferissueRequestDetail(@Valid TransferissueRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨出库申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRequestDetailSenior(CustomConditions conditions); + + /** * 更新调拨出库申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java index ebfff054..424f5da5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO; @@ -39,7 +40,10 @@ public class TransferissueRequestDetailServiceImpl implements TransferissueReque // 返回 return transferissueRequestDetail.getId(); } - + @Override + public PageResult getTransferissueRequestDetailSenior(CustomConditions conditions) { + return transferissueRequestDetailMapper.selectSenior(conditions); + } @Override public void updateTransferissueRequestDetail(TransferissueRequestDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java index 689516a2..3635aead 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferissueRequestMainService { * @return 编号 */ Long createTransferissueRequestMain(@Valid TransferissueRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRequestMainSenior(CustomConditions conditions); /** * 更新调拨出库申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index 0f9cca97..0b595cd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainPageReqVO; @@ -48,6 +49,10 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest TransferissueRequestMainDO updateObj = TransferissueRequestMainConvert.INSTANCE.convert(updateReqVO); transferissueRequestMainMapper.updateById(updateObj); } + @Override + public PageResult getTransferissueRequestMainSenior(CustomConditions conditions) { + return transferissueRequestMainMapper.selectSenior(conditions); + } @Override public void deleteTransferissueRequestMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java index eaf874bb..699ad76b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferlog; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogExportReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogPageReqVO; @@ -24,6 +25,13 @@ public interface TransferlogService { * @return 编号 */ String createTransferlog(@Valid TransferlogCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferlogSenior(CustomConditions conditions); /** * 更新库存转移日志 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java index 2938c5a4..c013fa44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferlog; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogExportReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogPageReqVO; @@ -48,6 +49,10 @@ public class TransferlogServiceImpl implements TransferlogService { TransferlogDO updateObj = TransferlogConvert.INSTANCE.convert(updateReqVO); transferlogMapper.updateById(updateObj); } + @Override + public PageResult getTransferlogSenior(CustomConditions conditions) { + return transferlogMapper.selectSenior(conditions); + } @Override public void deleteTransferlog(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java index a886edeb..57811783 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptJobDetailService { * @return 编号 */ Long createTransferreceiptJobDetail(@Valid TransferreceiptJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptJobDetailSenior(CustomConditions conditions); /** * 更新调拨入库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java index 81f60e04..1536e076 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO; @@ -39,7 +40,10 @@ public class TransferreceiptJobDetailServiceImpl implements TransferreceiptJobDe // 返回 return transferreceiptJobDetail.getId(); } - + @Override + public PageResult getTransferreceiptJobDetailSenior(CustomConditions conditions) { + return transferreceiptJobDetailMapper.selectSenior(conditions); + } @Override public void updateTransferreceiptJobDetail(TransferreceiptJobDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index 8ec36992..c1fe948f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptJobMainService { * @return 编号 */ Long createTransferreceiptJobMain(@Valid TransferreceiptJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨入库任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptJobMainSenior(CustomConditions conditions); /** * 更新调拨入库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index 653e39a0..4ee21b13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.transferreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain TransferreceiptJobMainDO updateObj = TransferreceiptJobMainConvert.INSTANCE.convert(updateReqVO); transferreceiptJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferreceiptJobMainSenior(CustomConditions conditions) { + return transferreceiptJobMainMapper.selectSenior(conditions); + } @Override public void deleteTransferreceiptJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java index 21d9ff64..ea3f6381 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptRecordDetailService { * @return 编号 */ Long createTransferreceiptRecordDetail(@Valid TransferreceiptRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨入库记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRecordDetailSenior(CustomConditions conditions); /** * 更新调拨入库记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java index 0bc7d045..7c16ecd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO; @@ -40,6 +41,11 @@ public class TransferreceiptRecordDetailServiceImpl implements TransferreceiptRe return transferreceiptRecordDetail.getId(); } + @Override + public PageResult getTransferreceiptRecordDetailSenior(CustomConditions conditions) { + return transferreceiptRecordDetailMapper.selectSenior(conditions); + } + @Override public void updateTransferreceiptRecordDetail(TransferreceiptRecordDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java index fb2a8a77..377aa55b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptRecordMainService { * @return 编号 */ Long createTransferreceiptRecordMain(@Valid TransferreceiptRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨入库记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRecordMainSenior(CustomConditions conditions); /** * 更新调拨入库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java index e5c520bb..3dee910a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco TransferreceiptRecordMainDO updateObj = TransferreceiptRecordMainConvert.INSTANCE.convert(updateReqVO); transferreceiptRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferreceiptRecordMainSenior(CustomConditions conditions) { + return transferreceiptRecordMainMapper.selectSenior(conditions); + } @Override public void deleteTransferreceiptRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java index 9b4eacd5..81a5b544 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailPageReqVO; @@ -31,6 +32,13 @@ public interface TransferreceiptRequestDetailService { * @param updateReqVO 更新信息 */ void updateTransferreceiptRequestDetail(@Valid TransferreceiptRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRequestDetailSenior(CustomConditions conditions); /** * 删除调拨入库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java index 656f33bb..7545b3d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptRequestMainService { * @return 编号 */ Long createTransferreceiptRequestMain(@Valid TransferreceiptRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRequestMainSenior(CustomConditions conditions); /** * 更新调拨入库申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java index f1e53728..cde12788 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO; @@ -40,6 +41,11 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq return transferreceiptRequestMain.getId(); } + @Override + public PageResult getTransferreceiptRequestMainSenior(CustomConditions conditions) { + return transferreceiptRequestMainMapper.selectSenior(conditions); + } + @Override public void updateTransferreceiptRequestMain(TransferreceiptRequestMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java index ba9ae548..e7d5a25e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueJobDetailService { * @return 编号 */ Long createUnplannedissueJobDetail(@Valid UnplannedissueJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueJobDetailSenior(CustomConditions conditions); /** * 更新计划外出库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java index cbf21953..1087044f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO; @@ -48,6 +49,10 @@ public class UnplannedissueJobDetailServiceImpl implements UnplannedissueJobDeta UnplannedissueJobDetailDO updateObj = UnplannedissueJobDetailConvert.INSTANCE.convert(updateReqVO); unplannedissueJobDetailMapper.updateById(updateObj); } + @Override + public PageResult getUnplannedissueJobDetailSenior(CustomConditions conditions) { + return unplannedissueJobDetailMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueJobDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java index c8132298..6762c8d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueJobMainService { * @return 编号 */ Long createUnplannedissueJobMain(@Valid UnplannedissueJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueJobMainSenior(CustomConditions conditions); /** * 更新计划外出库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 7ced0576..2e5cd419 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.unplannedissueJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe UnplannedissueJobMainDO updateObj = UnplannedissueJobMainConvert.INSTANCE.convert(updateReqVO); unplannedissueJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedissueJobMainSenior(CustomConditions conditions) { + return unplannedissueJobMainMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java index d4248b02..bf28dea4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueRecordDetailService { * @return 编号 */ Long createUnplannedissueRecordDetail(@Valid UnplannedissueRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRecordDetailSenior(CustomConditions conditions); /** * 更新计划外出库记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java index b6223efd..12142024 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO; @@ -56,6 +57,10 @@ public class UnplannedissueRecordDetailServiceImpl implements UnplannedissueReco // 删除 unplannedissueRecordDetailMapper.deleteById(id); } + @Override + public PageResult getUnplannedissueRecordDetailSenior(CustomConditions conditions) { + return unplannedissueRecordDetailMapper.selectSenior(conditions); + } private void validateUnplannedissueRecordDetailExists(Long id) { if (unplannedissueRecordDetailMapper.selectById(id) == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java index 5de1c971..d160193d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueRecordMainService { * @return 编号 */ Long createUnplannedissueRecordMain(@Valid UnplannedissueRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRecordMainSenior(CustomConditions conditions); /** * 更新计划外出库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java index 9faf71a6..89c23f9b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord public PageResult getUnplannedissueRecordMainPage(UnplannedissueRecordMainPageReqVO pageReqVO) { return unplannedissueRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getUnplannedissueRecordMainSenior(CustomConditions conditions) { + return unplannedissueRecordMainMapper.selectSenior(conditions); + } @Override public List getUnplannedissueRecordMainList(UnplannedissueRecordMainExportReqVO exportReqVO) { return unplannedissueRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java index 353f02c0..07d5bf46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueRequestDetailService { * @return 编号 */ Long createUnplannedissueRequestDetail(@Valid UnplannedissueRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索计划外出库申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRequestDetailSenior(CustomConditions conditions); /** * 更新计划外出库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java index f52aa000..e80ad7a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO; @@ -48,7 +49,10 @@ public class UnplannedissueRequestDetailServiceImpl implements UnplannedissueReq UnplannedissueRequestDetailDO updateObj = UnplannedissueRequestDetailConvert.INSTANCE.convert(updateReqVO); unplannedissueRequestDetailMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedissueRequestDetailSenior(CustomConditions conditions) { + return unplannedissueRequestDetailMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueRequestDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java index 0da78f03..a7b36905 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; @@ -25,6 +26,13 @@ public interface UnplannedissueRequestMainService { * @return 编号 */ Long createUnplannedissueRequestMain(@Valid UnplannedissueRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRequestMainSenior(CustomConditions conditions); /** * 更新计划外出库申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index 497a4fb0..81346cd8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; @@ -51,7 +52,10 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque UnplannedissueRequestMainDO updateObj = UnplannedissueRequestMainConvert.INSTANCE.convert(updateReqVO); unplannedissueRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedissueRequestMainSenior(CustomConditions conditions) { + return unplannedissueRequestMainMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java index e08bd95b..b5b69b92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptJobDetailService { * @return 编号 */ Long createUnplannedreceiptJobDetail(@Valid UnplannedreceiptJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptJobDetailSenior(CustomConditions conditions); /** * 更新计划外入库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java index 0be493b1..6b2ad27f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailPageReqVO; @@ -40,6 +41,11 @@ public class UnplannedreceiptJobDetailServiceImpl implements UnplannedreceiptJob return unplannedreceiptJobDetail.getId(); } + @Override + public PageResult getUnplannedreceiptJobDetailSenior(CustomConditions conditions) { + return unplannedreceiptJobDetailMapper.selectSenior(conditions); + } + @Override public void updateUnplannedreceiptJobDetail(UnplannedreceiptJobDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java index 2d82c5f0..56010f97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptJobMainService { * @return 编号 */ Long createUnplannedreceiptJobMain(@Valid UnplannedreceiptJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptJobMainSenior(CustomConditions conditions); /** * 更新计划外入库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 15cbf16b..ed0ec730 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -1,23 +1,19 @@ package com.win.module.wms.service.unplannedreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; 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.unplannedreceiptJob.UnplannedreceiptJobMainDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobMainConvert; import com.win.module.wms.dal.mysql.unplannedreceiptJob.UnplannedreceiptJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -59,6 +55,8 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa unplannedreceiptJobMainMapper.deleteById(id); } + + private void validateUnplannedreceiptJobMainExists(Long id) { if (unplannedreceiptJobMainMapper.selectById(id) == null) { throw exception(UNPLANNEDRECEIPT_JOB_MAIN_NOT_EXISTS); @@ -74,6 +72,10 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa public List getUnplannedreceiptJobMainList(Collection ids) { return unplannedreceiptJobMainMapper.selectBatchIds(ids); } + @Override + public PageResult getUnplannedreceiptJobMainSenior(CustomConditions conditions) { + return unplannedreceiptJobMainMapper.selectSenior(conditions); + } @Override public PageResult getUnplannedreceiptJobMainPage(UnplannedreceiptJobMainPageReqVO pageReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java index 94a6a18e..7796d1d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptRecordDetailService { * @return 编号 */ Long createUnplannedreceiptRecordDetail(@Valid UnplannedreceiptRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索计划外入库记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRecordDetailSenior(CustomConditions conditions); /** * 更新计划外入库记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java index 5dda2640..8199fab6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptR 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.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordDetailConvert; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -39,7 +36,10 @@ public class UnplannedreceiptRecordDetailServiceImpl implements Unplannedreceipt // 返回 return unplannedreceiptRecordDetail.getId(); } - + @Override + public PageResult getUnplannedreceiptRecordDetailSenior(CustomConditions conditions) { + return unplannedreceiptRecordDetailMapper.selectSenior(conditions); + } @Override public void updateUnplannedreceiptRecordDetail(UnplannedreceiptRecordDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java index a3b55e4c..1dfb4e11 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface UnplannedreceiptRecordMainService { */ Long createUnplannedreceiptRecordMain(@Valid UnplannedreceiptRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRecordMainSenior(CustomConditions conditions); + /** * 更新计划外入库记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java index c24b8aab..cdddc87e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptR 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.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordMainConvert; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -31,6 +28,12 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe @Resource private UnplannedreceiptRecordMainMapper unplannedreceiptRecordMainMapper; + @Override + public PageResult getUnplannedreceiptRecordMainSenior(CustomConditions conditions) { + return unplannedreceiptRecordMainMapper.selectSenior(conditions); + } + + @Override public Long createUnplannedreceiptRecordMain(UnplannedreceiptRecordMainCreateReqVO createReqVO) { // 插入 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java index 95a84d27..13b75b0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptRequestDetailService { * @return 编号 */ Long createUnplannedreceiptRequestDetail(@Valid UnplannedreceiptRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRequestDetailSenior(CustomConditions conditions); /** * 更新计划外入库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java index 6bc1a50f..5f98b9f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailPageReqVO; @@ -57,6 +58,11 @@ public class UnplannedreceiptRequestDetailServiceImpl implements Unplannedreceip unplannedreceiptRequestDetailMapper.deleteById(id); } + @Override + public PageResult getUnplannedreceiptRequestDetailSenior(CustomConditions conditions) { + return unplannedreceiptRequestDetailMapper.selectSenior(conditions); + } + private void validateUnplannedreceiptRequestDetailExists(Long id) { if (unplannedreceiptRequestDetailMapper.selectById(id) == null) { throw exception(UNPLANNEDRECEIPT_REQUEST_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java index a60a6429..53a752bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainPageReqVO; @@ -25,6 +26,14 @@ public interface UnplannedreceiptRequestMainService { */ Long createUnplannedreceiptRequestMain(@Valid UnplannedreceiptRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRequestMainSenior(CustomConditions conditions); + /** * 更新计划外入库申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java index 639ee908..9a9e07ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class UnplannedreceiptRequestMainServiceImpl implements UnplannedreceiptR UnplannedreceiptRequestMainDO updateObj = UnplannedreceiptRequestMainConvert.INSTANCE.convert(updateReqVO); unplannedreceiptRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedreceiptRequestMainSenior(CustomConditions conditions) { + return unplannedreceiptRequestMainMapper.selectSenior(conditions); + } @Override public void deleteUnplannedreceiptRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java index 980a5da7..4e8faf06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java @@ -3,9 +3,11 @@ package com.win.module.wms.service.warehouse; import java.util.*; import javax.validation.*; -import com.win.module.wms.controller.itembasic.vo.ItembasicImportExcelVo; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.controller.warehouse.vo.*; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.framework.common.pojo.PageResult; /** @@ -22,6 +24,13 @@ public interface WarehouseService { * @return 编号 */ Long createWarehouse(@Valid WarehouseCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWarehouseSenior(CustomConditions conditions); /** * 更新仓库 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java index b070a7c5..968b54cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.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.warehouse.vo.WarehouseCreateReqVO; @@ -13,6 +14,7 @@ import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO; import com.win.module.wms.controller.warehouse.vo.WarehouseUpdateReqVO; import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.convert.warehouse.WarehouseConvert; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; @@ -78,6 +80,7 @@ public class WarehouseServiceImpl implements WarehouseService { return warehouseMapper.selectBatchIds(ids); } + @Override public PageResult getWarehousePage(WarehousePageReqVO pageReqVO) { return warehouseMapper.selectPage(pageReqVO); @@ -87,6 +90,10 @@ public class WarehouseServiceImpl implements WarehouseService { public List getWarehouseList(WarehouseExportReqVO exportReqVO) { return warehouseMapper.selectList(exportReqVO); } + @Override + public PageResult getWarehouseSenior(CustomConditions conditions) { + return warehouseMapper.selectSenior(conditions); + } public List importWarehouseList(List warehouses, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(warehouses)) { @@ -95,24 +102,38 @@ public class WarehouseServiceImpl implements WarehouseService { List errorList = new ArrayList<>(); warehouses.forEach(warehouse -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; + if(mode != null){ - validateWarehouseForCreateOrUpdate(null,warehouse.getCode(),warehouse.getAvailable()); + try { + validateWarehouseExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,warehouse.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(warehouse.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - } catch (ServiceException ex) { + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(warehouse); - return; } - // 判断如果不存在，在进行插入 - WarehouseDO existWarehouse = warehouseMapper.selectByCode(warehouse.getCode()); - if (existWarehouse == null&& mode != 3) { - warehouseMapper.insert(WarehouseConvert.INSTANCE.convert(warehouse)); - } - else if (existWarehouse != null && mode != 2) {// 如果存在，判断是否允许更新 - WarehouseDO warehouseDO = WarehouseConvert.INSTANCE.convert(warehouse); - warehouseDO.setId(existWarehouse.getId()); - warehouseMapper.updateById(warehouseDO); + if(errorList == null){ WarehouseDO existWarehouse = warehouseMapper.selectByCode(warehouse.getCode()); + if (existWarehouse == null&& mode != 3) { + warehouseMapper.insert(WarehouseConvert.INSTANCE.convert(warehouse)); + } + else if (existWarehouse != null && mode != 2) {// 如果存在，判断是否允许更新 + WarehouseDO warehouseDO = WarehouseConvert.INSTANCE.convert(warehouse); + warehouseDO.setId(existWarehouse.getId()); + warehouseMapper.updateById(warehouseDO);} } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java index e92f968f..7fed2b26 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.work; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkDetailCreateReqVO; import com.win.module.wms.controller.work.vo.WorkDetailExportReqVO; import com.win.module.wms.controller.work.vo.WorkDetailPageReqVO; import com.win.module.wms.controller.work.vo.WorkDetailUpdateReqVO; + import com.win.module.wms.dal.dataobject.work.WorkDetailDO; import com.win.framework.common.pojo.PageResult; @@ -24,6 +26,13 @@ public interface WorkDetailService { * @return 编号 */ Long createWorkDetail(@Valid WorkDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkDetailSenior(CustomConditions conditions); /** * 更新生产订单子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java index 5cf3bc2c..61eaa818 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.work; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkDetailCreateReqVO; import com.win.module.wms.controller.work.vo.WorkDetailExportReqVO; import com.win.module.wms.controller.work.vo.WorkDetailPageReqVO; @@ -67,6 +68,11 @@ public class WorkDetailServiceImpl implements WorkDetailService { public WorkDetailDO getWorkDetail(Long id) { return workDetailMapper.selectById(id); } + + @Override + public PageResult getWorkDetailSenior(CustomConditions conditions) { + return workDetailMapper.selectSenior(conditions); + } @Override public List getWorkDetailList(Collection ids) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java index 7002e830..0dc1ae67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.work; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkMainCreateReqVO; import com.win.module.wms.controller.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; import com.win.module.wms.controller.work.vo.WorkMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import com.win.framework.common.pojo.PageResult; @@ -24,6 +26,13 @@ public interface WorkMainService { * @return 编号 */ Long createWorkMain(@Valid WorkMainCreateReqVO createReqVO); + /** + * 获得用高级搜索订单主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkMainSenior(CustomConditions conditions); /** * 更新生产订单主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java index 73db138a..c75089ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.work; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkMainCreateReqVO; import com.win.module.wms.controller.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; import com.win.module.wms.controller.work.vo.WorkMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -77,6 +79,10 @@ public class WorkMainServiceImpl implements WorkMainService { public PageResult getWorkMainPage(WorkMainPageReqVO pageReqVO) { return workMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getWorkMainSenior(CustomConditions conditions) { + return workMainMapper.selectSenior(conditions); + } @Override public List getWorkMainList(WorkMainExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java index 5e303599..41302a42 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java @@ -3,9 +3,11 @@ package com.win.module.wms.service.workshop; import java.util.*; import javax.validation.*; -import com.win.module.wms.controller.itembasic.vo.ItembasicImportExcelVo; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.controller.workshop.vo.*; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.framework.common.pojo.PageResult; /** @@ -44,6 +46,13 @@ public interface WorkshopService { * @return 车间 */ WorkshopDO getWorkshop(Long id); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkshopSenior(CustomConditions conditions); /** * 获得车间列表 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java index bcc767cd..124da091 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java @@ -5,10 +5,12 @@ 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.workshop.vo.*; import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.mysql.workshop.WorkshopMapper; @@ -83,33 +85,53 @@ public class WorkshopServiceImpl implements WorkshopService { return workshopMapper.selectList(exportReqVO); } + @Override + public PageResult getWorkshopSenior(CustomConditions conditions) { + return workshopMapper.selectSenior(conditions); + } + public List importUserList(List importWork, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(importWork)) { throw exception(WORKSHOP_IMPORT_LIST_IS_EMPTY); } List errorList = new ArrayList<>(); importWork.forEach(importWorkshop -> { - // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateWorkshopForCreateOrUpdate(null,importWorkshop.getCode(),importWorkshop.getAvailable()); + String massage = ""; + // 校验，判断是否有不符合的原因 + + if (mode != null) { + try { + validateWorkshopExists(null); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,importWorkshop.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(importWorkshop.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - } catch (ServiceException ex) { + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(importWorkshop); - return; } - // 判断如果不存在，在进行插入 - WorkshopDO existWorkshop = workshopMapper.selectByCode(importWorkshop.getCode()); - if (existWorkshop == null&& mode != 3) { - workshopMapper.insert(WorkshopConvert.INSTANCE.convert(importWorkshop)); - } - else if (existWorkshop != null && mode != 2) {// 如果存在，判断是否允许更新 - WorkshopDO workshopDO = WorkshopConvert.INSTANCE.convert(importWorkshop); - workshopDO.setId(existWorkshop.getId()); - workshopMapper.updateById(workshopDO); - } - }); + if(errorList == null) { + WorkshopDO existWorkshop = workshopMapper.selectByCode(importWorkshop.getCode()); + if (existWorkshop == null && mode != 3) { + workshopMapper.insert(WorkshopConvert.INSTANCE.convert(importWorkshop)); + } else if (existWorkshop != null && mode != 2) {// 如果存在，判断是否允许更新 + WorkshopDO workshopDO = WorkshopConvert.INSTANCE.convert(importWorkshop); + workshopDO.setId(existWorkshop.getId()); + workshopMapper.updateById(workshopDO); + } + } + }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java index df832fb2..8e0d6ac9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.workstation; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.workstation.vo.*; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import javax.validation.Valid; @@ -23,6 +25,14 @@ public interface WorkstationService { */ Long createWorkstation(@Valid WorkstationCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkstationSenior(CustomConditions conditions); + /** * 更新工位 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java index 71735fbb..00fcd30b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java @@ -6,11 +6,11 @@ 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.workstation.vo.*; import com.win.module.wms.convert.workstation.WorkstationConvert; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.mysql.workstation.WorkstationMapper; import org.springframework.stereotype.Service; @@ -95,26 +95,51 @@ public class WorkstationServiceImpl implements WorkstationService { } List errorList = new ArrayList<>(); workstations.forEach(workstation -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { if(mode != null){ - validateWorkstationForCreateOrUpdate(null,workstation.getCode(),workstation.getWorkshopCode(),workstation.getProductionLineCode(),workstation.getAvailable()); + try{ + validateWorkstationExists(null); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateCodeExists(null,workstation.getCode()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateWorkshopCodeExists(workstation.getWorkshopCode()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateProductionLineCodeExists(workstation.getProductionLineCode()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateAvailableExists(workstation.getAvailable()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(workstation); + } + // 判断如果不存在，在进行插入 + if(errorList == null){ + WorkstationDO existAccountcalendar = workstationMapper.selectByCode(workstation.getCode()); + if (existAccountcalendar == null&& mode != 3) { + workstationMapper.insert(WorkstationConvert.INSTANCE.convert(workstation)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + WorkstationDO workstationDo = WorkstationConvert.INSTANCE.convert(workstation); + workstationDo.setId(existAccountcalendar.getId()); + workstationMapper.updateById(workstationDo); + } + } } - } - catch (ServiceException ex) { - errorList.add(workstation); - return; - } - // 判断如果不存在，在进行插入 - WorkstationDO existAccountcalendar = workstationMapper.selectByCode(workstation.getCode()); - if (existAccountcalendar == null&& mode != 3) { - workstationMapper.insert(WorkstationConvert.INSTANCE.convert(workstation)); - } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - WorkstationDO workstationDo = WorkstationConvert.INSTANCE.convert(workstation); - workstationDo.setId(existAccountcalendar.getId()); - workstationMapper.updateById(workstationDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { @@ -182,6 +207,11 @@ public class WorkstationServiceImpl implements WorkstationService { throw exception(WORKSTATION_AVAIABLE_NOT_EXISTS); } } + @Override + public PageResult getWorkstationSenior(CustomConditions conditions) { + return workstationMapper.selectSenior(conditions); + } + @Override public WorkstationDO selectWorkstationExist(String pcode){ QueryWrapper queryWrapperWorkstation = new QueryWrapper(); From 8d37e6d8707b574810c71053b814537342667210 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 30 Oct 2023 15:26:51 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/dock/DockController.java | 24 ++++- .../documentSwitch/SwitchController.java | 21 ++++- .../documentSwitch/vo/SwitchRespVO.java | 7 ++ .../DocumentsettingController.java | 22 ++++- .../expectin/ExpectinController.java | 16 +++- .../expectin/vo/ExpectinRespVO.java | 8 ++ .../expectout/ExpectoutController.java | 16 +++- .../expectout/vo/ExpectoutRespVO.java | 8 ++ .../InspectJobDetailController.java | 15 ++- .../inspectJob/InspectJobMainController.java | 14 +++ .../InspectRecordDetailController.java | 16 +++- .../InspectRecordMainController.java | 14 +++ .../InspectRequestDetailController.java | 16 +++- .../InspectRequestMainController.java | 15 ++- .../vo/InspectRequestDetailRespVO.java | 8 ++ ...InventorychangeRecordDetailController.java | 15 ++- .../InventorychangeRecordMainController.java | 15 ++- ...nventorychangeRequestDetailController.java | 16 +++- .../InventorychangeRequestMainController.java | 16 +++- .../InventoryinitRecordDetailController.java | 15 ++- .../InventoryinitRecordMainController.java | 16 +++- .../InventoryinitRequestDetailController.java | 16 +++- .../InventoryinitRequestMainController.java | 16 +++- .../InventorymoveJobDetailController.java | 16 +++- .../InventorymoveJobMainController.java | 16 +++- .../InventorymoveRecordDetailController.java | 16 +++- .../InventorymoveRecordMainController.java | 17 +++- .../InventorymoveRequestDetailController.java | 17 +++- .../InventorymoveRequestMainController.java | 17 +++- .../issueJob/IssueJobDetailController.java | 17 +++- .../issueJob/IssueJobMainController.java | 15 ++- .../IssueRecordDetailController.java | 16 +++- .../IssueRecordMainController.java | 15 ++- .../IssueRequestDetailController.java | 16 +++- .../IssueRequestMainController.java | 18 +++- .../ItempackagingController.java | 33 ++++++- .../jobsetting/JobsettingController.java | 15 +++ .../labeltype/LabeltypeController.java | 15 ++- .../labeltype/vo/LabeltypeRespVO.java | 7 ++ .../location/LocationController.java | 32 ++++++- .../LocationcapacityController.java | 15 ++- .../vo/LocationcapacityRespVO.java | 7 ++ .../LocationgroupController.java | 23 ++++- ...flinesettlementRecordDetailController.java | 15 ++- ...OfflinesettlementRecordMainController.java | 15 ++- ...linesettlementRequestDetailController.java | 15 ++- ...fflinesettlementRequestMainController.java | 15 ++- ...nlinesettlementRecordDetailController.java | 15 ++- .../OnlinesettlementRecordMainController.java | 16 +++- ...linesettlementRequestDetailController.java | 16 +++- ...OnlinesettlementRequestMainController.java | 15 ++- .../wms/controller/owner/OwnerController.java | 23 ++++- .../module/wms/dal/mysql/dock/DockMapper.java | 6 +- .../mysql/documentSwitch/SwitchMapper.java | 6 ++ .../DocumentsettingMapper.java | 6 +- .../dal/mysql/expectin/ExpectinMapper.java | 6 +- .../dal/mysql/expectout/ExpectoutMapper.java | 6 +- .../inspectJob/InspectJobDetailMapper.java | 6 +- .../inspectJob/InspectJobMainMapper.java | 6 ++ .../InspectRecordDetailMapper.java | 6 +- .../InspectRecordMainMapper.java | 6 ++ .../InspectRequestDetailMapper.java | 6 ++ .../InspectRequestMainMapper.java | 6 +- .../InventorychangeRecordDetailMapper.java | 6 +- .../InventorychangeRecordMainMapper.java | 6 +- .../InventorychangeRequestDetailMapper.java | 6 +- .../InventorychangeRequestMainMapper.java | 6 +- .../InventoryinitRecordDetailMapper.java | 6 +- .../InventoryinitRecordMainMapper.java | 6 +- .../InventoryinitRequestDetailMapper.java | 6 +- .../InventoryinitRequestMainMapper.java | 6 +- .../InventorymoveJobDetailMapper.java | 6 +- .../InventorymoveJobMainMapper.java | 6 +- .../InventorymoveRecordDetailMapper.java | 6 +- .../InventorymoveRecordMainMapper.java | 6 +- .../InventorymoveRequestDetailMapper.java | 6 +- .../InventorymoveRequestMainMapper.java | 6 +- .../mysql/issueJob/IssueJobDetailMapper.java | 5 + .../mysql/issueJob/IssueJobMainMapper.java | 6 +- .../issueRecord/IssueRecordDetailMapper.java | 6 +- .../issueRecord/IssueRecordMainMapper.java | 6 +- .../IssueRequestDetailMapper.java | 6 +- .../issueRequest/IssueRequestMainMapper.java | 6 +- .../itempackaging/ItempackagingMapper.java | 6 +- .../mysql/jobsetting/JobsettingMapper.java | 6 +- .../dal/mysql/labeltype/LabeltypeMapper.java | 6 +- .../dal/mysql/location/LocationMapper.java | 6 +- .../LocationcapacityMapper.java | 6 +- .../locationgroup/LocationgroupMapper.java | 6 +- .../OfflinesettlementRecordDetailMapper.java | 6 +- .../OfflinesettlementRecordMainMapper.java | 6 +- .../OfflinesettlementRequestDetailMapper.java | 7 +- .../OfflinesettlementRequestMainMapper.java | 6 +- .../OnlinesettlementRecordDetailMapper.java | 6 +- .../OnlinesettlementRecordMainMapper.java | 6 +- .../OnlinesettlementRequestDetailMapper.java | 6 +- .../OnlinesettlementRequestMainMapper.java | 5 + .../wms/dal/mysql/owner/OwnerMapper.java | 6 +- .../wms/service/balance/BalanceService.java | 16 ++-- .../service/balance/BalanceServiceImpl.java | 40 ++++---- .../module/wms/service/dock/DockService.java | 10 ++ .../wms/service/dock/DockServiceImpl.java | 71 ++++++++++---- .../service/documentSwitch/SwitchService.java | 10 ++ .../documentSwitch/SwitchServiceImpl.java | 6 ++ .../DocumentsettingService.java | 8 ++ .../DocumentsettingServiceImpl.java | 93 ++++++++++++++---- .../wms/service/expectin/ExpectinService.java | 10 ++ .../service/expectin/ExpectinServiceImpl.java | 6 ++ .../service/expectout/ExpectoutService.java | 18 +++- .../expectout/ExpectoutServiceImpl.java | 16 ++-- .../inspectJob/InspectJobDetailService.java | 10 ++ .../InspectJobDetailServiceImpl.java | 6 ++ .../inspectJob/InspectJobMainService.java | 10 ++ .../inspectJob/InspectJobMainServiceImpl.java | 8 +- .../InspectRecordDetailService.java | 10 ++ .../InspectRecordDetailServiceImpl.java | 6 ++ .../InspectRecordMainService.java | 9 ++ .../InspectRecordMainServiceImpl.java | 6 ++ .../InspectRequestDetailService.java | 10 ++ .../InspectRequestDetailServiceImpl.java | 6 ++ .../InspectRequestMainService.java | 9 ++ .../InspectRequestMainServiceImpl.java | 6 +- .../InventorychangeRecordDetailService.java | 10 ++ ...nventorychangeRecordDetailServiceImpl.java | 6 +- .../InventorychangeRecordMainService.java | 10 ++ .../InventorychangeRecordMainServiceImpl.java | 6 +- .../InventorychangeRequestDetailService.java | 9 ++ ...ventorychangeRequestDetailServiceImpl.java | 6 +- .../InventorychangeRequestMainService.java | 8 ++ ...InventorychangeRequestMainServiceImpl.java | 6 +- .../InventoryinitRecordDetailService.java | 8 ++ .../InventoryinitRecordDetailServiceImpl.java | 6 +- .../InventoryinitRecordMainService.java | 10 ++ .../InventoryinitRecordMainServiceImpl.java | 6 +- .../InventoryinitRequestDetailService.java | 8 ++ ...InventoryinitRequestDetailServiceImpl.java | 6 +- .../InventoryinitRequestMainService.java | 8 ++ .../InventoryinitRequestMainServiceImpl.java | 6 +- .../InventorymoveJobDetailService.java | 9 ++ .../InventorymoveJobDetailServiceImpl.java | 7 +- .../InventorymoveJobMainService.java | 9 ++ .../InventorymoveJobMainServiceImpl.java | 6 +- .../InventorymoveRecordDetailService.java | 9 ++ .../InventorymoveRecordDetailServiceImpl.java | 6 +- .../InventorymoveRecordMainService.java | 9 ++ .../InventorymoveRecordMainServiceImpl.java | 7 +- .../InventorymoveRequestDetailService.java | 9 ++ ...InventorymoveRequestDetailServiceImpl.java | 8 +- .../InventorymoveRequestMainService.java | 9 ++ .../InventorymoveRequestMainServiceImpl.java | 7 +- .../issueJob/IssueJobDetailService.java | 9 ++ .../issueJob/IssueJobDetailServiceImpl.java | 7 +- .../service/issueJob/IssueJobMainService.java | 9 ++ .../issueJob/IssueJobMainServiceImpl.java | 8 +- .../issueRecord/IssueRecordDetailService.java | 9 ++ .../IssueRecordDetailServiceImpl.java | 6 +- .../issueRecord/IssueRecordMainService.java | 9 ++ .../IssueRecordMainServiceImpl.java | 6 +- .../IssueRequestDetailService.java | 9 ++ .../IssueRequestDetailServiceImpl.java | 6 +- .../issueRequest/IssueRequestMainService.java | 9 ++ .../IssueRequestMainServiceImpl.java | 5 + .../itempackaging/ItempackagingService.java | 9 ++ .../ItempackagingServiceImpl.java | 66 ++++++++++--- .../service/jobsetting/JobsettingService.java | 8 ++ .../jobsetting/JobsettingServiceImpl.java | 6 +- .../service/labeltype/LabeltypeService.java | 8 ++ .../labeltype/LabeltypeServiceImpl.java | 6 +- .../wms/service/location/LocationService.java | 12 ++- .../service/location/LocationServiceImpl.java | 94 ++++++++++++++----- .../LocationcapacityService.java | 9 ++ .../LocationcapacityServiceImpl.java | 5 + .../locationgroup/LocationgroupService.java | 10 ++ .../LocationgroupServiceImpl.java | 61 ++++++++---- .../OfflinesettlementRecordDetailService.java | 9 ++ ...linesettlementRecordDetailServiceImpl.java | 5 + .../OfflinesettlementRecordMainService.java | 9 ++ ...fflinesettlementRecordMainServiceImpl.java | 6 +- ...OfflinesettlementRequestDetailService.java | 9 ++ ...inesettlementRequestDetailServiceImpl.java | 5 + .../OfflinesettlementRequestMainService.java | 9 ++ ...flinesettlementRequestMainServiceImpl.java | 5 + .../OnlinesettlementRecordDetailService.java | 9 ++ ...linesettlementRecordDetailServiceImpl.java | 6 +- .../OnlinesettlementRecordMainService.java | 9 ++ ...OnlinesettlementRecordMainServiceImpl.java | 6 +- .../OnlinesettlementRequestDetailService.java | 9 ++ ...inesettlementRequestDetailServiceImpl.java | 6 +- .../OnlinesettlementRequestMainService.java | 9 ++ ...nlinesettlementRequestMainServiceImpl.java | 5 + .../wms/service/owner/OwnerService.java | 9 ++ .../wms/service/owner/OwnerServiceImpl.java | 58 +++++++++--- .../win/module/wms/until/job/JobUtils.java | 91 +++++++++++++----- 193 files changed, 2084 insertions(+), 298 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java index 163b857c..cfacc0b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java @@ -1,6 +1,6 @@ package com.win.module.wms.controller.dock; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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; @@ -29,10 +29,8 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -import static com.win.module.wms.enums.ErrorCodeConstants.*; @Tag(name = "管理后台 - 月台") @RestController @@ -98,6 +96,19 @@ public class DockController { return success(DockConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得月台分页") + @PreAuthorize("@ss.hasPermission('wms:dock:query')") + public CommonResult> getDockSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = dockService.getDockSenior(conditions); + PageResult result = DockConvert.INSTANCE.convertPage(pageResult); + for(DockRespVO 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:dock:export')") @@ -112,7 +123,12 @@ public class DockController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE); + mapDropDown.put(5, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, available);; + ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.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/documentSwitch/SwitchController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java index 1749e999..53a43dd5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.documentSwitch; -import com.win.module.wms.controller.documentSwitch.vo.*; +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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class SwitchController { @Resource private SwitchService switchService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建单据开关") @PreAuthorize("@ss.hasPermission('wms:switch:create')") @@ -79,6 +84,20 @@ public class SwitchController { return success(SwitchConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得单据开关分页") + @PreAuthorize("@ss.hasPermission('wms:switch:query')") + public CommonResult> getSwitchSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = switchService.getSwitchSenior(conditions); + PageResult result = SwitchConvert.INSTANCE.convertPage(pageResult); + for(SwitchRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/page") @Operation(summary = "获得单据开关分页") @PreAuthorize("@ss.hasPermission('wms:switch:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java index 757c9863..67ee1061 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.documentSwitch.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 单据开关 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,9 @@ public class SwitchRespVO extends SwitchBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17760") private Long id; + @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/documentsetting/DocumentsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java index cc8b9c10..af13eb4e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.documentsetting; 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; @@ -94,6 +95,20 @@ public class DocumentsettingController { return success(DocumentsettingConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得单据设置分页") + @PreAuthorize("@ss.hasPermission('wms:documentsetting:query')") + public CommonResult> getDocumentsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = documentsettingService.getDocumentsettingSenior(conditions); + PageResult result = DocumentsettingConvert.INSTANCE.convertPage(pageResult); + for(DocumentsettingRespVO 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:documentsetting:export')") @@ -108,7 +123,12 @@ public class DocumentsettingController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCUMENT_TYPE); + mapDropDown.put(3, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(10, available);; + ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.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/expectin/ExpectinController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java index 7954c44f..9cd137f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.expectin; +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.expectin.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class ExpectinController { return success(ExpectinConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得预计入库存分页") + @PreAuthorize("@ss.hasPermission('wms:expectin:query')") + public CommonResult> getExpectinSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = expectinService.getExpectinSenior(conditions); + PageResult result = ExpectinConvert.INSTANCE.convertPage(pageResult); + for(ExpectinRespVO 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:expectin:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java index 8f665072..a487317d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectin.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 ExpectinRespVO extends ExpectinBaseVO { + @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/expectout/ExpectoutController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java index 97159844..35fcc3a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.expectout; +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.expectout.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class ExpectoutController { return success(ExpectoutConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:expectout:query')") + public CommonResult> getExpectoutSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = expectoutService.getExpectoutSenior(conditions); + PageResult result = ExpectoutConvert.INSTANCE.convertPage(pageResult); + for(ExpectoutRespVO 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:expectout:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java index baf46bcd..793468cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectout.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 ExpectoutRespVO extends ExpectoutBaseVO { + @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/inspectJob/InspectJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java index b1ff2f49..74e59f55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inspectJob; +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.inspectJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InspectJobDetailController { return success(InspectJobDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验任务子分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')") + public CommonResult> getInspectJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectJobDetailService.getInspectJobDetailSenior(conditions); + PageResult result = InspectJobDetailConvert.INSTANCE.convertPage(pageResult); + for(InspectJobDetailRespVO 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:inspect-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index 851fa7aa..dd9e0a5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectJob; +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.inspectJob.vo.*; @@ -91,6 +92,19 @@ public class InspectJobMainController { return success(InspectJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验任务主分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") + public CommonResult> getInspectJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectJobMainService.getInspectJobMainSenior(conditions); + PageResult result = InspectJobMainConvert.INSTANCE.convertPage(pageResult); + for(InspectJobMainRespVO 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:inspect-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java index 3c7daf8a..2e55c7ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inspectRecord; +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.inspectRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InspectRecordDetailController { return success(InspectRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验记录子分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')") + public CommonResult> getInspectRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRecordDetailService.getInspectRecordDetailSenior(conditions); + PageResult result = InspectRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InspectRecordDetailRespVO 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:inspect-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java index d036f068..3f9753cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectRecord; +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.inspectRecord.vo.*; @@ -91,6 +92,19 @@ public class InspectRecordMainController { return success(InspectRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')") + public CommonResult> getInspectRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRecordMainService.getInspectRecordMainSenior(conditions); + PageResult result = InspectRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InspectRecordMainRespVO 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:inspect-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java index 9dfb2c6b..a5bbc6ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inspectRequest; +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.inspectRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InspectRequestDetailController { return success(InspectRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')") + public CommonResult> getInspectRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRequestDetailService.getInspectRequestDetailSenior(conditions); + PageResult result = InspectRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InspectRequestDetailRespVO 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:inspect-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 94f80db6..e0541a86 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectRequest; +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.inspectRequest.vo.*; @@ -89,7 +90,19 @@ public class InspectRequestMainController { PageResult pageResult = inspectRequestMainService.getInspectRequestMainPage(pageVO); return success(InspectRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验申请主分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')") + public CommonResult> getInspectRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRequestMainService.getInspectRequestMainSenior(conditions); + PageResult result = InspectRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InspectRequestMainRespVO 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:inspect-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java index 28d77f02..c4f7e591 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.inspectRequest.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 InspectRequestDetailRespVO extends InspectRequestDetailBaseVO { + @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/inventorychangeRecord/InventorychangeRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java index 4242914f..70de96d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRecord; +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.inventorychangeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InventorychangeRecordDetailController { return success(InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改记录子分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getInventorychangeRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRecordDetailService.getInventorychangeRecordDetailSenior(conditions); + PageResult result = InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRecordDetailRespVO 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:inventorychange-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java index 0f428a89..571e7cd8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRecord; +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.inventorychangeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InventorychangeRecordMainController { return success(InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:query')") + public CommonResult> getInventorychangeRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRecordMainService.getInventorychangeRecordMainSenior(conditions); + PageResult result = InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRecordMainRespVO 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:inventorychange-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java index 128a2134..af17c79a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRequest; +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.inventorychangeRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventorychangeRequestDetailController { PageResult pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailPage(pageVO); return success(InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:query')") + public CommonResult> getInventorychangeRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailSenior(conditions); + PageResult result = InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRequestDetailRespVO 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:inventorychange-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java index 7c8f3c15..414df52c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRequest; +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.inventorychangeRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventorychangeRequestMainController { PageResult pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainPage(pageVO); return success(InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改申请主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:query')") + public CommonResult> getInventorychangeRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainSenior(conditions); + PageResult result = InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRequestMainRespVO 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:inventorychange-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java index 542672aa..bfee1615 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRecord; +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.inventoryinitRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InventoryinitRecordDetailController { return success(InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化记录子分页") + @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:query')") + public CommonResult> getInventoryinitRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRecordDetailService.getInventoryinitRecordDetailSenior(conditions); + PageResult result = InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRecordDetailRespVO 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:inventoryinit-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java index f34afe63..ab2989ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRecord; +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.inventoryinitRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventoryinitRecordMainController { PageResult pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainPage(pageVO); return success(InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:query')") + public CommonResult> getInventoryinitRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainSenior(conditions); + PageResult result = InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRecordMainRespVO 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:inventoryinit-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java index 52960e84..f63866f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRequest; +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.inventoryinitRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InventoryinitRequestDetailController { return success(InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:query')") + public CommonResult> getInventoryinitRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRequestDetailService.getInventoryinitRequestDetailSenior(conditions); + PageResult result = InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRequestDetailRespVO 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:inventoryinit-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java index bc9a9dbc..dd2e7ba6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRequest; +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.inventoryinitRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventoryinitRequestMainController { PageResult pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainPage(pageVO); return success(InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化申请主分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getInventoryinitRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainSenior(conditions); + PageResult result = InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRequestMainRespVO 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:inventoryinit-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java index 7a7a523f..9777ad0f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveJob; +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.inventorymoveJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class InventorymoveJobDetailController { PageResult pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO); return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移任务子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')") + public CommonResult> getInventorymoveJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailSenior(conditions); + PageResult result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveJobDetailRespVO 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:inventorymove-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index e26e60e2..39ded59d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveJob; +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.inventorymoveJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InventorymoveJobMainController { return success(InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移任务主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')") + public CommonResult> getInventorymoveJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveJobMainService.getInventorymoveJobMainSenior(conditions); + PageResult result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveJobMainRespVO 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:inventorymove-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java index c95f0be8..e138ae9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRecord; +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.inventorymoveRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -94,6 +94,20 @@ public class InventorymoveRecordDetailController { return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移记录子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')") + public CommonResult> getInventorymoveRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailSenior(conditions); + PageResult result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRecordDetailRespVO 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:inventorymove-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java index 88cc6211..eb8016c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRecord; +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.inventorymoveRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,20 @@ public class InventorymoveRecordMainController { PageResult pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainPage(pageVO); return success(InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:query')") + public CommonResult> getInventorymoveRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainSenior(conditions); + PageResult result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRecordMainRespVO 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:inventorymove-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java index 585c24de..2d40239f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRequest; +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.inventorymoveRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,20 @@ public class InventorymoveRequestDetailController { PageResult pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailPage(pageVO); return success(InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-detail:query')") + public CommonResult> getInventorymoveRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailSenior(conditions); + PageResult result = InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRequestDetailRespVO 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:inventorymove-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java index 2a4bc880..50fd7ebe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRequest; +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.inventorymoveRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,20 @@ public class InventorymoveRequestMainController { PageResult pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainPage(pageVO); return success(InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移申请主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:query')") + public CommonResult> getInventorymoveRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainSenior(conditions); + PageResult result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRequestMainRespVO 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:inventorymove-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java index 2c0f9869..82e34c52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueJob; +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.issueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,20 @@ public class IssueJobDetailController { PageResult pageResult = issueJobDetailService.getIssueJobDetailPage(pageVO); return success(IssueJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:issue-job-detail:query')") + public CommonResult> getIssueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueJobDetailService.getIssueJobDetailSenior(conditions); + PageResult result = IssueJobDetailConvert.INSTANCE.convertPage(pageResult); + for(IssueJobDetailRespVO 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:issue-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java index 6d9fe2b7..dc32f486 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueJob; +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.issueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class IssueJobMainController { return success(IssueJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料任务主分页分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getIssueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueJobMainService.getIssueJobMainSenior(conditions); + PageResult result = IssueJobMainConvert.INSTANCE.convertPage(pageResult); + for(IssueJobMainRespVO 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:issue-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java index b5107747..cf251b29 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRecord; +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.issueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class IssueRecordDetailController { PageResult pageResult = issueRecordDetailService.getIssueRecordDetailPage(pageVO); return success(IssueRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:issue-record-detail:query')") + public CommonResult> getIssueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRecordDetailService.getIssueRecordDetailSenior(conditions); + PageResult result = IssueRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(IssueRecordDetailRespVO 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:issue-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java index 10dd6b8c..d3711b7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRecord; +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.issueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class IssueRecordMainController { return success(IssueRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:issue-record-main:query')") + public CommonResult> getIssueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRecordMainService.getIssueRecordMainSenior(conditions); + PageResult result = IssueRecordMainConvert.INSTANCE.convertPage(pageResult); + for(IssueRecordMainRespVO 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:issue-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java index 3c4f227d..257ab3c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRequest; +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.issueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class IssueRequestDetailController { return success(IssueRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料申请子分页") + @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:query')") + public CommonResult> getIssueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRequestDetailService.getIssueRequestDetailSenior(conditions); + PageResult result = IssueRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(IssueRequestDetailRespVO 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:issue-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java index a1e5f78e..cb39848c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRequest; +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.issueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,21 @@ public class IssueRequestMainController { PageResult pageResult = issueRequestMainService.getIssueRequestMainPage(pageVO); return success(IssueRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料申请主分页") + @PreAuthorize("@ss.hasPermission('wms:issue-request-main:query')") + public CommonResult> getIssueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRequestMainService.getIssueRequestMainSenior(conditions); + PageResult result = IssueRequestMainConvert.INSTANCE.convertPage(pageResult); + for(IssueRequestMainRespVO 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:issue-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index 895aff75..2b3d3b8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.itempackaging; 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; @@ -86,13 +87,26 @@ public class ItempackagingController { } @GetMapping("/page") - @Operation(summary = "获得物品包装信息 分页") + @Operation(summary = "获得物品包装信息分页") @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") public CommonResult> getItempackagingPage(@Valid ItempackagingPageReqVO pageVO) { PageResult pageResult = itempackagingService.getItempackagingPage(pageVO); return success(ItempackagingConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品包装信息分页") + @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") + public CommonResult> getItempackagingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = itempackagingService.getItempackagingSenior(conditions); + PageResult result = ItempackagingConvert.INSTANCE.convertPage(pageResult); + for(ItempackagingRespVO 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:itempackaging:export')") @@ -107,7 +121,22 @@ public class ItempackagingController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(1, uom); + String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(2, description);; + String[] altPackUnit1 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(5, altPackUnit1);; + String[] altPackUnit2 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(7, altPackUnit2);; + String[] altPackUnit3 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(9, altPackUnit3);; + String[] altPackUnit4 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(11, altPackUnit4);; + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(13, available);; + ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.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/jobsetting/JobsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java index 6524c936..158e8ef8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.jobsetting; 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; @@ -111,6 +112,20 @@ public class JobsettingController { ExcelUtils.write(response, "任务设置.xls", "数据", JobsettingExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得任务设置分页") + @PreAuthorize("@ss.hasPermission('wms:jobsetting:query')") + public CommonResult> getJobsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = jobsettingService.getJobsettingSenior(conditions); + PageResult result = JobsettingConvert.INSTANCE.convertPage(pageResult); + for(JobsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/get-import-template") @Operation(summary = "获得导入任务设置模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java index e0ca7166..986d9f0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.labeltype; 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; @@ -88,7 +89,19 @@ public class LabeltypeController { PageResult pageResult = labeltypeService.getLabeltypePage(pageVO); return success(LabeltypeConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得标签定义分页") + @PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')") + public CommonResult> getLabeltypeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = labeltypeService.getLabeltypeSenior(conditions); + PageResult result = LabeltypeConvert.INSTANCE.convertPage(pageResult); + for(LabeltypeRespVO 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:labeltypeService:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java index 2c289263..b8f632e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.labeltype.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 标签定义 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,9 @@ public class LabeltypeRespVO extends LabeltypeBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5848") private Long id; + @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/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 94b74076..19d8e128 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.location; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.win.framework.common.exception.ErrorCode; 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; @@ -10,10 +10,7 @@ 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.location.vo.*; -import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.location.LocationConvert; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; @@ -114,6 +111,20 @@ public class LocationController { return success(LocationConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getLocationSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = locationService.getLocationSenior(conditions); + PageResult result = LocationConvert.INSTANCE.convertPage(pageResult); + for(LocationRespVO 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:location:export')") @@ -128,7 +139,18 @@ public class LocationController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, warehouseCode); + String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); + mapDropDown.put(4, areaCode); + String[] erpLocationCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ERP_LOCATION); + mapDropDown.put(6, erpLocationCode); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(7, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(18, available);; + ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.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/locationcapacity/LocationcapacityController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java index 35a45950..884d3ca3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.locationcapacity; +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.locationcapacity.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class LocationcapacityController { return success(LocationcapacityConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库位容量分页") + @PreAuthorize("@ss.hasPermission('wms:locationcapacity:query')") + public CommonResult> getLocationcapacitySenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = locationcapacityService.getLocationcapacitySenior(conditions); + PageResult result = LocationcapacityConvert.INSTANCE.convertPage(pageResult); + for(LocationcapacityRespVO 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:locationcapacity:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java index a6e85f48..3bc46451 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java @@ -3,10 +3,17 @@ package com.win.module.wms.controller.locationcapacity.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 LocationcapacityRespVO extends LocationcapacityBaseVO { + @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/locationgroup/LocationgroupController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java index 8d48f29f..d9e114dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.locationgroup; 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; @@ -92,6 +93,19 @@ public class LocationgroupController { return success(LocationgroupConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库位组分页") + @PreAuthorize("@ss.hasPermission('wms:locationgroup:query')") + public CommonResult> getLocationgroupSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = locationgroupService.getLocationgroupSenior(conditions); + PageResult result = LocationgroupConvert.INSTANCE.convertPage(pageResult); + for(LocationgroupRespVO 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:locationgroup:export')") @@ -106,7 +120,14 @@ public class LocationgroupController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, warehouseCode); + String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); + mapDropDown.put(4, areaCode); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(5, available);; + ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.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/offlinesettlementRecord/OfflinesettlementRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java index 36377d6d..40ea6a62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRecord; +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.offlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,6 +91,19 @@ public class OfflinesettlementRecordDetailController { return success(OfflinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算记录子分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-detail:query')") + public CommonResult> getOfflinesettlementRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRecordDetailService.getOfflinesettlementRecordDetailSenior(conditions); + PageResult result = OfflinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRecordDetailRespVO 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:offlinesettlement-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java index c1ef89a9..237b3c44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRecord; +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.offlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OfflinesettlementRecordMainController { return success(OfflinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算记录主分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-main:query')") + public CommonResult> getOfflinesettlementRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRecordMainService.getOfflinesettlementRecordMainSenior(conditions); + PageResult result = OfflinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRecordMainRespVO 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:offlinesettlement-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java index baa45795..d45f8774 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRequest; +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.offlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OfflinesettlementRequestDetailController { return success(OfflinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算申请子分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-detail:query')") + public CommonResult> getOfflinesettlementRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRequestDetailService.getOfflinesettlementRequestDetailSenior(conditions); + PageResult result = OfflinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRequestDetailRespVO 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:offlinesettlement-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java index 50adf550..f87da9a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRequest; +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.offlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OfflinesettlementRequestMainController { return success(OfflinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算申请主分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-main:query')") + public CommonResult> getOfflinesettlementRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRequestMainService.getOfflinesettlementRequestMainSenior(conditions); + PageResult result = OfflinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRequestMainRespVO 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:offlinesettlement-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java index 0b3b0ef8..69b1c669 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRecord; +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.onlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OnlinesettlementRecordDetailController { return success(OnlinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算记录子分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-detail:query')") + public CommonResult> getOnlinesettlementRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRecordDetailService.getOnlinesettlementRecordDetailSenior(conditions); + PageResult result = OnlinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRecordDetailRespVO 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:onlinesettlement-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java index ab781efc..2b07915e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRecord; +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.onlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class OnlinesettlementRecordMainController { return success(OnlinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算记录主分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-main:query')") + public CommonResult> getOnlinesettlementRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRecordMainService.getOnlinesettlementRecordMainSenior(conditions); + PageResult result = OnlinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRecordMainRespVO 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:onlinesettlement-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java index 4849a238..7308e0ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRequest; +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.onlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class OnlinesettlementRequestDetailController { return success(OnlinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算申请子分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-detail:query')") + public CommonResult> getOnlinesettlementRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRequestDetailService.getOnlinesettlementRequestDetailSenior(conditions); + PageResult result = OnlinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRequestDetailRespVO 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:onlinesettlement-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java index ecaf9821..000c3d43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRequest; +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.onlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OnlinesettlementRequestMainController { return success(OnlinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算申请主分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-main:query')") + public CommonResult> getOnlinesettlementRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRequestMainService.getOnlinesettlementRequestMainSenior(conditions); + PageResult result = OnlinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRequestMainRespVO 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:onlinesettlement-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java index f9955b09..012d6523 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.owner; 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; @@ -94,6 +95,19 @@ public class OwnerController { return success(OwnerConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得货主分页") + @PreAuthorize("@ss.hasPermission('wms:owner:query')") + public CommonResult> getOwnerSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = ownerService.getOwnerSenior(conditions); + PageResult result = OwnerConvert.INSTANCE.convertPage(pageResult); + for(OwnerRespVO 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:owner:export')") @@ -108,7 +122,14 @@ public class OwnerController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(11, currency); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.OWNER_TYPE); + mapDropDown.put(13, type);; + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(14, available);; + ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.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/dal/mysql/dock/DockMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java index bcd94e53..cc340543 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.dock; +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.dock.vo.DockExportReqVO; import com.win.module.wms.controller.dock.vo.DockPageReqVO; import com.win.module.wms.dal.dataobject.dock.DockDO; @@ -38,7 +40,9 @@ public interface DockMapper extends BaseMapperX { .eqIfPresent(DockDO::getCreator, reqVO.getCreator()) .orderByDesc(DockDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DockExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DockDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java index 63d4b9ae..65baf3b5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.documentSwitch; 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.documentSwitch.vo.SwitchExportReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO; import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO; @@ -27,6 +29,10 @@ public interface SwitchMapper extends BaseMapperX { .orderByDesc(SwitchDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(SwitchExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SwitchDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java index 84f8a392..e255ece2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.documentsetting; +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.documentsetting.vo.DocumentsettingExportReqVO; import com.win.module.wms.controller.documentsetting.vo.DocumentsettingPageReqVO; import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO; @@ -39,7 +41,9 @@ public interface DocumentsettingMapper extends BaseMapperX { .eqIfPresent(DocumentsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(DocumentsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DocumentsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DocumentsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java index 8b981803..a3a25eeb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.expectin; 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.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; @@ -32,7 +34,9 @@ public interface ExpectinMapper extends BaseMapperX { .eqIfPresent(ExpectinDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(ExpectinDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ExpectinExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ExpectinDO::getJobNumber, reqVO.getJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java index ddc5b874..fbc257c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.expectout; 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.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; @@ -33,7 +35,9 @@ public interface ExpectoutMapper extends BaseMapperX { .eqIfPresent(ExpectoutDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(ExpectoutDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ExpectoutExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ExpectoutDO::getJobNumber, reqVO.getJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java index d3764393..37dafd94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectJob; 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.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; @@ -37,7 +39,9 @@ public interface InspectJobDetailMapper extends BaseMapperX .eqIfPresent(InspectJobDetailDO::getUom, reqVO.getUom()) .orderByDesc(InspectJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InspectJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java index 186ac391..18b303a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectJob; 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.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; @@ -69,6 +71,10 @@ public interface InspectJobMainMapper extends BaseMapperX { .orderByDesc(InspectJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(InspectJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java index 768f6d5b..ee22d652 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRecord; 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.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; @@ -53,7 +55,9 @@ public interface InspectRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InspectRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java index 24aeceda..e47c0f9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRecord; 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.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; @@ -60,6 +62,10 @@ public interface InspectRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(InspectRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java index e42b84d6..5c0c97a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRequest; 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.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; @@ -36,6 +38,10 @@ public interface InspectRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(InspectRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java index fb812a6c..be64ad21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRequest; 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.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; @@ -53,7 +55,9 @@ public interface InspectRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InspectRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRequestMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java index 3aa4982e..305147e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRecord; 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.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRecord.InventorychangeRecordDetailDO; @@ -59,7 +61,9 @@ public interface InventorychangeRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRecordDetailDO::getLocationCode, reqVO.getLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java index 68226d7a..7f456250 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRecord; 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.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRecord.InventorychangeRecordMainDO; @@ -39,7 +41,9 @@ public interface InventorychangeRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java index e45b1742..c9de03c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRequest; 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.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestDetailDO; @@ -58,7 +60,9 @@ public interface InventorychangeRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRequestDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java index 3ed16700..462f310c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRequest; 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.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestMainDO; @@ -38,7 +40,9 @@ public interface InventorychangeRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java index 1e43bc43..c0b6dc64 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRecord; 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.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordDetailDO; @@ -52,7 +54,9 @@ public interface InventoryinitRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRecordDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java index 8a8e13df..b8f8ce37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRecord; 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.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordMainDO; @@ -39,7 +41,9 @@ public interface InventoryinitRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java index e43594d8..1e4a71d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRequest; 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.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestDetailDO; @@ -49,7 +51,9 @@ public interface InventoryinitRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRequestDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java index 42ca5f28..d3a151f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRequest; 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.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestMainDO; @@ -38,7 +40,9 @@ public interface InventoryinitRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java index 56bd0fa6..7a65e9c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveJob; 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.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; @@ -43,7 +45,9 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveJobDetailDO::getItemCode, reqVO.getItemCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java index 7bf8eba9..17988377 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveJob; 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.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; @@ -60,7 +62,9 @@ public interface InventorymoveJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java index 3bfb8cb5..19a62444 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRecord; 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.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO; @@ -53,7 +55,9 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java index 49c8b29d..03577d0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRecord; 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.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; @@ -46,7 +48,9 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java index 1613ae46..1a3342bc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRequest; 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.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestDetailDO; @@ -47,7 +49,9 @@ public interface InventorymoveRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java index 31c3eb17..b7b85c2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRequest; 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.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; @@ -44,7 +46,9 @@ public interface InventorymoveRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRequestMainDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java index 718212df..31279cf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueJob; 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.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; @@ -49,6 +51,9 @@ public interface IssueJobDetailMapper extends BaseMapperX { .orderByDesc(IssueJobDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java index 7aeb6efb..297aacfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueJob; 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.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; @@ -60,7 +62,9 @@ public interface IssueJobMainMapper extends BaseMapperX { .eqIfPresent(IssueJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch()) .orderByDesc(IssueJobMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java index 9dd1a73f..e22985ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRecord; 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.issueRecord.vo.IssueRecordDetailExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO; @@ -54,7 +56,9 @@ public interface IssueRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java index bcbffe77..4f95c186 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRecord; 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.issueRecord.vo.IssueRecordMainExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; @@ -47,7 +49,9 @@ public interface IssueRecordMainMapper extends BaseMapperX { .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(IssueRecordMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java index ed0a65de..69f49db5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRequest; 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.issueRequest.vo.IssueRequestDetailExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO; @@ -44,7 +46,9 @@ public interface IssueRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java index e3d975dc..f56eafe4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRequest; 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.issueRequest.vo.IssueRequestMainExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO; @@ -45,7 +47,9 @@ public interface IssueRequestMainMapper extends BaseMapperX .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) .orderByDesc(IssueRequestMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java index 89a55c6b..1c1512fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.itempackaging; +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.itempackaging.vo.ItempackagingExportReqVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingPageReqVO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; @@ -40,7 +42,9 @@ public interface ItempackagingMapper extends BaseMapperX { .eqIfPresent(ItempackagingDO::getCreator, reqVO.getCreator()) .orderByDesc(ItempackagingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ItempackagingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ItempackagingDO::getItemCode, reqVO.getItemCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java index 43bd082e..e20b0ee1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.jobsetting; +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.jobsetting.vo.JobsettingExportReqVO; import com.win.module.wms.controller.jobsetting.vo.JobsettingPageReqVO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; @@ -41,7 +43,9 @@ public interface JobsettingMapper extends BaseMapperX { .eqIfPresent(JobsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(JobsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(JobsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(JobsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java index f5db825b..fb3e94c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.labeltype; +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.labeltype.vo.LabeltypeExportReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypePageReqVO; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; @@ -39,7 +41,9 @@ public interface LabeltypeMapper extends BaseMapperX { .eqIfPresent(LabeltypeDO::getIsCompress, reqVO.getIsCompress()) .orderByDesc(LabeltypeDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LabeltypeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LabeltypeDO::getLabelType, reqVO.getLabelType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java index f6e5236a..0516283d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.location; +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.location.vo.LocationExportReqVO; import com.win.module.wms.controller.location.vo.LocationPageReqVO; import com.win.module.wms.dal.dataobject.location.LocationDO; @@ -45,7 +47,9 @@ public interface LocationMapper extends BaseMapperX { .eqIfPresent(LocationDO::getCreator, reqVO.getCreator()) .orderByDesc(LocationDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LocationExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LocationDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java index d5186fa8..2a1b35d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.locationcapacity; 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.locationcapacity.vo.LocationcapacityExportReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO; import com.win.module.wms.dal.dataobject.locationcapacity.LocationcapacityDO; @@ -28,7 +30,9 @@ public interface LocationcapacityMapper extends BaseMapperX .eqIfPresent(LocationcapacityDO::getIsInfinity, reqVO.getIsInfinity()) .orderByDesc(LocationcapacityDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LocationcapacityExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LocationcapacityDO::getLocationCode, reqVO.getLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java index 25dc1377..a0bf6491 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.locationgroup; +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.locationgroup.vo.LocationgroupExportReqVO; import com.win.module.wms.controller.locationgroup.vo.LocationgroupPageReqVO; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; @@ -33,7 +35,9 @@ public interface LocationgroupMapper extends BaseMapperX { .eqIfPresent(LocationgroupDO::getCreator, reqVO.getCreator()) .orderByDesc(LocationgroupDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LocationgroupExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LocationgroupDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java index 042cd6b4..aaead8b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRecord; 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.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.offlinesettlementRecord.OfflinesettlementRecordDetailDO; @@ -41,7 +43,9 @@ public interface OfflinesettlementRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java index 80456683..ba90fdec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRecord; 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.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.offlinesettlementRecord.OfflinesettlementRecordMainDO; @@ -39,7 +41,9 @@ public interface OfflinesettlementRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java index 2177d345..4a99e660 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.offlinesettlementRequest; 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.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.offlinesettlementRequest.OfflinesettlementRequestDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -40,7 +43,9 @@ public interface OfflinesettlementRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java index c3924853..2efbb592 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRequest; 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.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.offlinesettlementRequest.OfflinesettlementRequestMainDO; @@ -40,7 +42,9 @@ public interface OfflinesettlementRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRequestMainDO::getProductReceiptRecordNumber, reqVO.getProductReceiptRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java index 807f6e40..0c1d5edb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRecord; 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.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordDetailDO; @@ -41,7 +43,9 @@ public interface OnlinesettlementRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java index f9962504..efc7bd7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRecord; 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.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordMainDO; @@ -39,7 +41,9 @@ public interface OnlinesettlementRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java index b0988631..9b41805e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRequest; 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.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRequest.OnlinesettlementRequestDetailDO; @@ -40,7 +42,9 @@ public interface OnlinesettlementRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java index ee11583e..113b85a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRequest; 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.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRequest.OnlinesettlementRequestMainDO; @@ -40,6 +42,9 @@ public interface OnlinesettlementRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRequestMainDO::getIssueRecordNumber, reqVO.getIssueRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java index bea482a3..ecf719c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.owner; +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.owner.vo.OwnerExportReqVO; import com.win.module.wms.controller.owner.vo.OwnerPageReqVO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; @@ -42,7 +44,9 @@ public interface OwnerMapper extends BaseMapperX { .eqIfPresent(OwnerDO::getAvailable, reqVO.getAvailable()) .orderByDesc(OwnerDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OwnerExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OwnerDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 777cfd59..c9370db0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -84,22 +84,22 @@ public interface BalanceService { * 跟据管理模式查询数量 * @author lianhongxi * @param itemcode 物品code - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectNumber(String itemcode, String inventorystatus, String locationcode); + public List selectNumber(String itemcode, List inventoryStatus, String locationcode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 * @author lianhongxi * @param itemcode 物品code * @param batch 批次 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectBatch(String itemcode, String batch, String inventorystatus, String locationcode); + public List selectBatch(String itemcode, String batch, List inventoryStatus, String locationcode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -107,20 +107,20 @@ public interface BalanceService { * @param itemcode 物品code * @param batch 批次 * @param packingnumber 包装号 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode); + public List selectPackaging(String itemcode, String packingnumber, String batch, List inventoryStatus, String locationcode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 * @author lianhongxi * @param packingnumber 包装号 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectUniqueId(String packingnumber, String locationcode, String inventorystatus); + public List selectUniqueId(String packingnumber, String locationcode, List inventoryStatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index c89893f9..a171b821 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -105,21 +105,21 @@ public class BalanceServiceImpl implements BalanceService { * 跟据管理模式查询数量 * @author lianhongxi * @param itemcode 物品code - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ @Override - public List selectNumber(String itemcode, String inventorystatus, String locationcode) { + public List selectNumber(String itemcode, List inventoryStatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.eq("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "物料号" + itemcode + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } @@ -129,22 +129,22 @@ public class BalanceServiceImpl implements BalanceService { * @author lianhongxi * @param itemcode 物品code * @param batch 批次 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ @Override - public List selectBatch(String itemcode, String batch, String inventorystatus, String locationcode) { + public List selectBatch(String itemcode, String batch, List inventoryStatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.eq("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "物料号" + itemcode + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } @@ -157,23 +157,23 @@ public class BalanceServiceImpl implements BalanceService { * @param itemcode 物品code * @param packingnumber 包装号 * @param batch 批次 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ @Override - public List selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) { + public List selectPackaging(String itemcode, String packingnumber, String batch, List inventoryStatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("batch", batch); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.eq("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "物料号" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } @@ -183,20 +183,20 @@ public class BalanceServiceImpl implements BalanceService { * @author lianhongxi * @param packingnumber 包装号 * @param locationcode 库位code - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @return */ @Override - public List selectUniqueId(String packingnumber, String locationcode, String inventorystatus) { + public List selectUniqueId(String packingnumber, String locationcode, List inventoryStatus) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("packing_number", packingnumber); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "唯一码" + packingnumber + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java index df6089a3..61b0e00d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.dock; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.dal.dataobject.dock.DockDO; @@ -61,6 +62,15 @@ public interface DockService { */ PageResult getDockPage(DockPageReqVO pageReqVO); + /** + * 获得用高级搜索月台分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDockSenior(CustomConditions conditions); + + /** * 获得月台列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java index e3a73759..79c3ee21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.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.dock.vo.*; @@ -78,6 +79,11 @@ public class DockServiceImpl implements DockService { return dockMapper.selectPage(pageReqVO); } + @Override + public PageResult getDockSenior(CustomConditions conditions) { + return dockMapper.selectSenior(conditions); + } + @Override public List getDockList(DockExportReqVO exportReqVO) { return dockMapper.selectList(exportReqVO); @@ -90,24 +96,56 @@ public class DockServiceImpl implements DockService { } List errorList = new ArrayList<>(); docks.forEach(dock -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateDockForCreateOrUpdate(null,dock.getCode(),dock.getType(),dock.getWarehouseCode(),dock.getDefaultLocationCode(),dock.getAvailable());} - } catch (ServiceException ex) { - errorList.add(dock); - return; + if(mode != null) { + try { + validateDockExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,dock.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateTypeExists(dock.getType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateWareHouseCodeExists(dock.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDefaultLocationCodeExists(dock.getDefaultLocationCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(dock.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - DockDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - dockMapper.insert(DockConvert.INSTANCE.convert(dock)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(dock); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - DockDO dockDO = DockConvert.INSTANCE.convert(dock); - dockDO.setId(existConfigurationSetting.getId()); - dockMapper.updateById(dockDO); + if(errorList == null){ + DockDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + dockMapper.insert(DockConvert.INSTANCE.convert(dock)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + DockDO dockDO = DockConvert.INSTANCE.convert(dock); + dockDO.setId(existConfigurationSetting.getId()); + dockMapper.updateById(dockDO); + } } + // 判断如果不存在，在进行插入 }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { @@ -196,9 +234,4 @@ public class DockServiceImpl implements DockService { } } - - - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java index 9193c3bd..01dcd581 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.documentSwitch; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.documentSwitch.vo.SwitchCreateReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchExportReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO; @@ -63,6 +64,15 @@ public interface SwitchService { */ PageResult getSwitchPage(SwitchPageReqVO pageReqVO); + /** + * 获得用高级搜索单据开关分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSwitchSenior(CustomConditions conditions); + + /** * 获得单据开关列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java index 7a9839bf..f2f892e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.documentSwitch; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.documentSwitch.vo.SwitchCreateReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchExportReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO; @@ -84,6 +85,11 @@ public class SwitchServiceImpl implements SwitchService { return switchMapper.selectList(exportReqVO); } + @Override + public PageResult getSwitchSenior(CustomConditions conditions) { + return switchMapper.selectSenior(conditions); + } + @Override public SwitchDO selectSwitchExist(String pcode){ QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java index 7e09824f..d851320b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.documentsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.documentsetting.vo.*; import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO; @@ -60,6 +61,13 @@ public interface DocumentsettingService { * @return 单据设置分页 */ PageResult getDocumentsettingPage(DocumentsettingPageReqVO pageReqVO); + /** + * 获得用高级搜索单据设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDocumentsettingSenior(CustomConditions conditions); /** * 获得单据设置列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java index b67f2817..4df23dd0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.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.documentsetting.vo.*; @@ -87,6 +88,11 @@ public class DocumentsettingServiceImpl implements DocumentsettingService { return documentsettingMapper.selectList(exportReqVO); } + @Override + public PageResult getDocumentsettingSenior(CustomConditions conditions) { + return documentsettingMapper.selectSenior(conditions); + } + @Override public List documentSettingimportDocumentList(List documentsettings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(documentsettings)) { @@ -95,24 +101,79 @@ public class DocumentsettingServiceImpl implements DocumentsettingService { List errorList = new ArrayList<>(); documentsettings.forEach(documentsetting -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateDocumentsettingForCreateOrUpdate(null,documentsetting.getCode(),documentsetting.getName(),documentsetting.getDescription(),documentsetting.getType() - ,documentsetting.getBusinessType(),documentsetting.getNumberPrefix(),documentsetting.getDateFormat(),documentsetting.getSerialLength(),documentsetting.getResetPeriod() - ,documentsetting.getAvailable());} - } catch (ServiceException ex) { - errorList.add(documentsetting); - return; + String massage = ""; + if(mode != null){ + try { + validateDocumentsettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,documentsetting.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateNameExists(documentsetting.getName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDescriptionExists(documentsetting.getDescription()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateTypeExists(documentsetting.getType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateBusinessTypeExists(documentsetting.getBusinessType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateNumberPrefixExists(documentsetting.getNumberPrefix()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDateFormatExists(documentsetting.getDateFormat()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSerialLengthExists(documentsetting.getSerialLength()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateResetPeriodExists(documentsetting.getResetPeriod()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(documentsetting.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - DocumentsettingDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - documentsettingMapper.insert(DocumentsettingConvert.INSTANCE.convert(documentsetting)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(documentsetting); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - DocumentsettingDO documentsettingMapperDO = DocumentsettingConvert.INSTANCE.convert(documentsetting); - documentsettingMapperDO.setId(existConfigurationSetting.getId()); - documentsettingMapper.updateById(documentsettingMapperDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + DocumentsettingDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + documentsettingMapper.insert(DocumentsettingConvert.INSTANCE.convert(documentsetting)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + DocumentsettingDO documentsettingMapperDO = DocumentsettingConvert.INSTANCE.convert(documentsetting); + documentsettingMapperDO.setId(existConfigurationSetting.getId()); + documentsettingMapper.updateById(documentsettingMapperDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java index ab6b6b62..3fe7abbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.expectin; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; @@ -63,6 +64,15 @@ public interface ExpectinService { */ PageResult getExpectinPage(ExpectinPageReqVO pageReqVO); + /** + * 获得用高级搜索预计入库存分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getExpectinSenior(CustomConditions conditions); + + /** * 获得预计入库存列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java index 02603757..de1e270b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.expectin; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; @@ -78,6 +79,11 @@ public class ExpectinServiceImpl implements ExpectinService { return expectinMapper.selectPage(pageReqVO); } + @Override + public PageResult getExpectinSenior(CustomConditions conditions) { + return expectinMapper.selectSenior(conditions); + } + @Override public List getExpectinList(ExpectinExportReqVO exportReqVO) { return expectinMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java index 994aef5e..526740f2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.expectout; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; @@ -63,6 +64,15 @@ public interface ExpectoutService { */ PageResult getExpectoutPage(ExpectoutPageReqVO pageReqVO); + /** + * 获得用高级搜索预计出库存分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getExpectoutSenior(CustomConditions conditions); + + /** * 获得预计出库存列表, 用于 Excel 导出 * @@ -79,7 +89,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectNumberNew(String itemcode, String inventorystatus, String locationcode); + public List selectNumberNew(String itemcode, List inventorystatus, String locationcode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 @@ -90,7 +100,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectBatchNew(String itemcode, String batch, String inventorystatus, String locationcode); + public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -102,7 +112,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectPackingNew(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode); + public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 @@ -112,6 +122,6 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectUniqeIdNew(String packingnumber, String locationcode, String inventorystatus); + public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java index 7d35d1f4..6e69b849 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java @@ -1,13 +1,12 @@ package com.win.module.wms.service.expectout; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; -import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.service.rule.RuleService; -import com.win.module.wms.service.rule.RuleServiceImpl; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,9 +89,14 @@ public class ExpectoutServiceImpl implements ExpectoutService { return expectoutMapper.selectList(exportReqVO); } + @Override + public PageResult getExpectoutSenior(CustomConditions conditions) { + return expectoutMapper.selectSenior(conditions); + } + //按数量查找 BY_BATCH @Override - public List selectNumberNew(String itemcode, String inventorystatus, String locationcode) { + public List selectNumberNew(String itemcode, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("inventory_status", inventorystatus); @@ -107,7 +111,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按批次查询 BY_BATCH @Override - public List selectBatchNew(String itemcode, String batch, String inventorystatus, String locationcode) { + public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); @@ -123,7 +127,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按包裝 BY_PACKAGING @Override - public List selectPackingNew(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) { + public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); @@ -140,7 +144,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按唯一码查询 BY_UNIQUE_ID @Override - public List selectUniqeIdNew(String packingnumber, String locationcode, String inventorystatus) { + public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("inventory_status", inventorystatus); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java index a8bc621d..e9a214f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InspectJobDetailService { */ PageResult getInspectJobDetailPage(InspectJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索检验任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectJobDetailSenior(CustomConditions conditions); + + /** * 获得检验任务子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java index cc022dec..3f17e55f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; @@ -78,6 +79,11 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService { return inspectJobDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectJobDetailSenior(CustomConditions conditions) { + return inspectJobDetailMapper.selectSenior(conditions); + } + @Override public List getInspectJobDetailList(InspectJobDetailExportReqVO exportReqVO) { return inspectJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index d6fc355c..06d67c0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; @@ -63,6 +64,15 @@ public interface InspectJobMainService { */ PageResult getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO); + /** + * 获得用高级搜索检验任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectJobMainSenior(CustomConditions conditions); + + /** * 获得检验任务主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 05e86117..5e47d566 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.inspectJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -79,7 +79,11 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { public PageResult getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO) { return inspectJobMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInspectJobMainSenior(CustomConditions conditions) { + return inspectJobMainMapper.selectSenior(conditions); + } @Override public List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) { return inspectJobMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java index b863d34b..30e3934a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InspectRecordDetailService { */ PageResult getInspectRecordDetailPage(InspectRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索检验记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRecordDetailSenior(CustomConditions conditions); + + /** * 获得检验记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java index b323f320..4364efbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; @@ -78,6 +79,11 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic return inspectRecordDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectRecordDetailSenior(CustomConditions conditions) { + return inspectRecordDetailMapper.selectSenior(conditions); + } + @Override public List getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO) { return inspectRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java index 9366a1a8..bceb9cbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; @@ -63,6 +64,14 @@ public interface InspectRecordMainService { */ PageResult getInspectRecordMainPage(InspectRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索检验记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRecordMainSenior(CustomConditions conditions); + /** * 获得检验记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java index 8a6edd67..1c5cf25a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; @@ -78,6 +79,11 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService { return inspectRecordMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectRecordMainSenior(CustomConditions conditions) { + return inspectRecordMainMapper.selectSenior(conditions); + } + @Override public List getInspectRecordMainList(InspectRecordMainExportReqVO exportReqVO) { return inspectRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java index a532173e..271f2f04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InspectRequestDetailService { */ PageResult getInspectRequestDetailPage(InspectRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索检验申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRequestDetailSenior(CustomConditions conditions); + + /** * 获得检验申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java index aa3ee3f8..1a7a7af3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; @@ -78,6 +79,11 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ return inspectRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectRequestDetailSenior(CustomConditions conditions) { + return inspectRequestDetailMapper.selectSenior(conditions); + } + @Override public List getInspectRequestDetailList(InspectRequestDetailExportReqVO exportReqVO) { return inspectRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java index 264e524a..8976d42c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface InspectRequestMainService { */ PageResult getInspectRequestMainPage(InspectRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索检验申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRequestMainSenior(CustomConditions conditions); + /** * 获得检验申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 12167acc..ee28b26f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService public PageResult getInspectRequestMainPage(InspectRequestMainPageReqVO pageReqVO) { return inspectRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInspectRequestMainSenior(CustomConditions conditions) { + return inspectRequestMainMapper.selectSenior(conditions); + } @Override public List getInspectRequestMainList(InspectRequestMainExportReqVO exportReqVO) { return inspectRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java index 13a753ae..2dc07508 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InventorychangeRecordDetailService { */ PageResult getInventorychangeRecordDetailPage(InventorychangeRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存修改记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRecordDetailSenior(CustomConditions conditions); + + /** * 获得库存修改记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java index ef1b4289..60f5362e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRecordDetailServiceImpl implements InventorychangeRe public PageResult getInventorychangeRecordDetailPage(InventorychangeRecordDetailPageReqVO pageReqVO) { return inventorychangeRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRecordDetailSenior(CustomConditions conditions) { + return inventorychangeRecordDetailMapper.selectSenior(conditions); + } @Override public List getInventorychangeRecordDetailList(InventorychangeRecordDetailExportReqVO exportReqVO) { return inventorychangeRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java index c8440f9e..d31f510a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO; @@ -63,6 +64,15 @@ public interface InventorychangeRecordMainService { */ PageResult getInventorychangeRecordMainPage(InventorychangeRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存修改记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRecordMainSenior(CustomConditions conditions); + + /** * 获得库存修改记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java index e7cae997..7c67b204 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRecordMainServiceImpl implements InventorychangeReco public PageResult getInventorychangeRecordMainPage(InventorychangeRecordMainPageReqVO pageReqVO) { return inventorychangeRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRecordMainSenior(CustomConditions conditions) { + return inventorychangeRecordMainMapper.selectSenior(conditions); + } @Override public List getInventorychangeRecordMainList(InventorychangeRecordMainExportReqVO exportReqVO) { return inventorychangeRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java index 7ebf0cdd..969bd4bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface InventorychangeRequestDetailService { */ PageResult getInventorychangeRequestDetailPage(InventorychangeRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存修改申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRequestDetailSenior(CustomConditions conditions); + /** * 获得库存修改申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java index aa033541..b480a104 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRequestDetailServiceImpl implements InventorychangeR public PageResult getInventorychangeRequestDetailPage(InventorychangeRequestDetailPageReqVO pageReqVO) { return inventorychangeRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRequestDetailSenior(CustomConditions conditions) { + return inventorychangeRequestDetailMapper.selectSenior(conditions); + } @Override public List getInventorychangeRequestDetailList(InventorychangeRequestDetailExportReqVO exportReqVO) { return inventorychangeRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java index 4718ac97..52db0695 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO; @@ -54,6 +55,13 @@ public interface InventorychangeRequestMainService { * @return 库存修改申请主列表 */ List getInventorychangeRequestMainList(Collection ids); + /** + * 获得用高级搜索库存修改申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRequestMainSenior(CustomConditions conditions); /** * 获得库存修改申请主分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java index 89ce1e0c..0923192c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq public PageResult getInventorychangeRequestMainPage(InventorychangeRequestMainPageReqVO pageReqVO) { return inventorychangeRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRequestMainSenior(CustomConditions conditions) { + return inventorychangeRequestMainMapper.selectSenior(conditions); + } @Override public List getInventorychangeRequestMainList(InventorychangeRequestMainExportReqVO exportReqVO) { return inventorychangeRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java index 7914b24e..ec30926e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface InventoryinitRecordDetailService { * @return 库存初始化记录子分页 */ PageResult getInventoryinitRecordDetailPage(InventoryinitRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRecordDetailSenior(CustomConditions conditions); /** * 获得库存初始化记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java index c5e102cc..b88c6b93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRecordDetailServiceImpl implements InventoryinitRecord public PageResult getInventoryinitRecordDetailPage(InventoryinitRecordDetailPageReqVO pageReqVO) { return inventoryinitRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRecordDetailSenior(CustomConditions conditions) { + return inventoryinitRecordDetailMapper.selectSenior(conditions); + } @Override public List getInventoryinitRecordDetailList(InventoryinitRecordDetailExportReqVO exportReqVO) { return inventoryinitRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java index 70989904..c00349b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO; @@ -63,6 +64,15 @@ public interface InventoryinitRecordMainService { */ PageResult getInventoryinitRecordMainPage(InventoryinitRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRecordMainSenior(CustomConditions conditions); + + /** * 获得库存初始化记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java index 88222f8f..ef18a424 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRecordMainServiceImpl implements InventoryinitRecordMa public PageResult getInventoryinitRecordMainPage(InventoryinitRecordMainPageReqVO pageReqVO) { return inventoryinitRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRecordMainSenior(CustomConditions conditions) { + return inventoryinitRecordMainMapper.selectSenior(conditions); + } @Override public List getInventoryinitRecordMainList(InventoryinitRecordMainExportReqVO exportReqVO) { return inventoryinitRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java index bf5f47aa..d45c7148 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO; @@ -62,6 +63,13 @@ public interface InventoryinitRequestDetailService { * @return 库存初始化申请子分页 */ PageResult getInventoryinitRequestDetailPage(InventoryinitRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRequestDetailSenior(CustomConditions conditions); /** * 获得库存初始化申请子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java index d8b0052c..0a1d33ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRequestDetailServiceImpl implements InventoryinitReque public PageResult getInventoryinitRequestDetailPage(InventoryinitRequestDetailPageReqVO pageReqVO) { return inventoryinitRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRequestDetailSenior(CustomConditions conditions) { + return inventoryinitRequestDetailMapper.selectSenior(conditions); + } @Override public List getInventoryinitRequestDetailList(InventoryinitRequestDetailExportReqVO exportReqVO) { return inventoryinitRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java index 874cf1ca..adaec648 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface InventoryinitRequestMainService { * @return 库存初始化申请主分页 */ PageResult getInventoryinitRequestMainPage(InventoryinitRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRequestMainSenior(CustomConditions conditions); /** * 获得库存初始化申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java index b9d4d705..d76142ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest public PageResult getInventoryinitRequestMainPage(InventoryinitRequestMainPageReqVO pageReqVO) { return inventoryinitRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRequestMainSenior(CustomConditions conditions) { + return inventoryinitRequestMainMapper.selectSenior(conditions); + } @Override public List getInventoryinitRequestMainList(InventoryinitRequestMainExportReqVO exportReqVO) { return inventoryinitRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java index 5a7b9e6f..37a4d0f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO; @@ -62,6 +63,14 @@ public interface InventorymoveJobDetailService { * @return 库存转移任务子分页 */ PageResult getInventorymoveJobDetailPage(InventorymoveJobDetailPageReqVO pageReqVO); + + /** + * 获得用高级搜索库存转移任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveJobDetailSenior(CustomConditions conditions); /** * 获得库存转移任务子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java index d79f5722..37dcd65a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO; @@ -77,7 +78,11 @@ public class InventorymoveJobDetailServiceImpl implements InventorymoveJobDetail public PageResult getInventorymoveJobDetailPage(InventorymoveJobDetailPageReqVO pageReqVO) { return inventorymoveJobDetailMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveJobDetailSenior(CustomConditions conditions) { + return inventorymoveJobDetailMapper.selectSenior(conditions); + } @Override public List getInventorymoveJobDetailList(InventorymoveJobDetailExportReqVO exportReqVO) { return inventorymoveJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index b8d90153..af2fbd4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; @@ -70,6 +71,14 @@ public interface InventorymoveJobMainService { * @return 库存转移任务主列表 */ List getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO); + + /** + * 获得用高级搜索库存转移任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveJobMainSenior(CustomConditions conditions); /** * 校验任务状态正确 *@author chenfang diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index 44ce1a36..d54340bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.inventorymoveJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -85,6 +85,10 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ return inventorymoveJobMainMapper.selectList(exportReqVO); } @Override + public PageResult getInventorymoveJobMainSenior(CustomConditions conditions) { + return inventorymoveJobMainMapper.selectSenior(conditions); + } + @Override public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("number",pnumber); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java index d9301018..ec5fa9b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO; @@ -55,6 +56,14 @@ public interface InventorymoveRecordDetailService { */ List getInventorymoveRecordDetailList(Collection ids); + /** + * 获得用高级搜索库存转移记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRecordDetailSenior(CustomConditions conditions); + /** * 获得库存转移记录子分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java index 62adf1f7..b57784b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO; @@ -72,7 +73,10 @@ public class InventorymoveRecordDetailServiceImpl implements InventorymoveRecord public List getInventorymoveRecordDetailList(Collection ids) { return inventorymoveRecordDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getInventorymoveRecordDetailSenior(CustomConditions conditions) { + return inventorymoveRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getInventorymoveRecordDetailPage(InventorymoveRecordDetailPageReqVO pageReqVO) { return inventorymoveRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java index 34752d7f..37618ee2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; @@ -62,6 +63,14 @@ public interface InventorymoveRecordMainService { * @return 库存转移记录主分页 */ PageResult getInventorymoveRecordMainPage(InventorymoveRecordMainPageReqVO pageReqVO); + + /** + * 获得用高级搜索库存转移记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRecordMainSenior(CustomConditions conditions); /** * 获得库存转移记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java index 9f11b4d5..ae929318 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; @@ -77,7 +78,11 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa public PageResult getInventorymoveRecordMainPage(InventorymoveRecordMainPageReqVO pageReqVO) { return inventorymoveRecordMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveRecordMainSenior(CustomConditions conditions) { + return inventorymoveRecordMainMapper.selectSenior(conditions); + } @Override public List getInventorymoveRecordMainList(InventorymoveRecordMainExportReqVO exportReqVO) { return inventorymoveRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java index 332a569b..36c29d4c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface InventorymoveRequestDetailService { */ PageResult getInventorymoveRequestDetailPage(InventorymoveRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存转移申请子分页分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRequestDetailSenior(CustomConditions conditions); + /** * 获得库存转移申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java index 80627fda..342fbbee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO; @@ -77,7 +78,12 @@ public class InventorymoveRequestDetailServiceImpl implements InventorymoveReque public PageResult getInventorymoveRequestDetailPage(InventorymoveRequestDetailPageReqVO pageReqVO) { return inventorymoveRequestDetailMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveRequestDetailSenior(CustomConditions conditions) { + return inventorymoveRequestDetailMapper.selectSenior(conditions); + } + @Override public List getInventorymoveRequestDetailList(InventorymoveRequestDetailExportReqVO exportReqVO) { return inventorymoveRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java index 2f3d1c7d..37e54d2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface InventorymoveRequestMainService { */ PageResult getInventorymoveRequestMainPage(InventorymoveRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存转移申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRequestMainSenior(CustomConditions conditions); + /** * 获得库存转移申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index 5b14fdf7..3adcecec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO; @@ -77,7 +78,11 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest public PageResult getInventorymoveRequestMainPage(InventorymoveRequestMainPageReqVO pageReqVO) { return inventorymoveRequestMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveRequestMainSenior(CustomConditions conditions) { + return inventorymoveRequestMainMapper.selectSenior(conditions); + } @Override public List getInventorymoveRequestMainList(InventorymoveRequestMainExportReqVO exportReqVO) { return inventorymoveRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java index 92da83f1..c00a531a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; @@ -63,6 +64,14 @@ public interface IssueJobDetailService { */ PageResult getIssueJobDetailPage(IssueJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发料任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueJobDetailSenior(CustomConditions conditions); + /** * 获得发料任务子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java index bb5f66ae..1f164b7c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; @@ -72,7 +73,11 @@ public class IssueJobDetailServiceImpl implements IssueJobDetailService { public List getIssueJobDetailList(Collection ids) { return issueJobDetailMapper.selectBatchIds(ids); } - + + @Override + public PageResult getIssueJobDetailSenior(CustomConditions conditions) { + return issueJobDetailMapper.selectSenior(conditions); + } @Override public PageResult getIssueJobDetailPage(IssueJobDetailPageReqVO pageReqVO) { return issueJobDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index 7981f8b8..34291fc9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobMainCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; @@ -63,6 +64,14 @@ public interface IssueJobMainService { */ PageResult getIssueJobMainPage(IssueJobMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发料任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueJobMainSenior(CustomConditions conditions); + /** * 获得发料任务主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index deb2791e..b6416a46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.issueJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobMainCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -79,7 +79,11 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { public PageResult getIssueJobMainPage(IssueJobMainPageReqVO pageReqVO) { return issueJobMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getIssueJobMainSenior(CustomConditions conditions) { + return issueJobMainMapper.selectSenior(conditions); + } @Override public List getIssueJobMainList(IssueJobMainExportReqVO exportReqVO) { return issueJobMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java index 7c1fd9fb..54fc99fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRecordDetailService { */ PageResult getIssueRecordDetailPage(IssueRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发料记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRecordDetailSenior(CustomConditions conditions); + /** * 获得发料记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java index 8da4ee60..849307f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class IssueRecordDetailServiceImpl implements IssueRecordDetailService { public PageResult getIssueRecordDetailPage(IssueRecordDetailPageReqVO pageReqVO) { return issueRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getIssueRecordDetailSenior(CustomConditions conditions) { + return issueRecordDetailMapper.selectSenior(conditions); + } @Override public List getIssueRecordDetailList(IssueRecordDetailExportReqVO exportReqVO) { return issueRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java index 12ceeb05..a97abbef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRecordMainService { */ PageResult getIssueRecordMainPage(IssueRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发料记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRecordMainSenior(CustomConditions conditions); + /** * 获得发料记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java index 52b9507c..6598559e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { public PageResult getIssueRecordMainPage(IssueRecordMainPageReqVO pageReqVO) { return issueRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getIssueRecordMainSenior(CustomConditions conditions) { + return issueRecordMainMapper.selectSenior(conditions); + } @Override public List getIssueRecordMainList(IssueRecordMainExportReqVO exportReqVO) { return issueRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java index 05af0efb..60822cdc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRequestDetailService { */ PageResult getIssueRequestDetailPage(IssueRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发料申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRequestDetailSenior(CustomConditions conditions); + /** * 获得发料申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java index 50a38c2c..202525a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class IssueRequestDetailServiceImpl implements IssueRequestDetailService public PageResult getIssueRequestDetailPage(IssueRequestDetailPageReqVO pageReqVO) { return issueRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getIssueRequestDetailSenior(CustomConditions conditions) { + return issueRequestDetailMapper.selectSenior(conditions); + } @Override public List getIssueRequestDetailList(IssueRequestDetailExportReqVO exportReqVO) { return issueRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java index 97144eb3..fe7a7350 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRequestMainService { */ PageResult getIssueRequestMainPage(IssueRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发料申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRequestMainSenior(CustomConditions conditions); + /** * 获得发料申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java index 273b7e44..ef6a6e10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO; @@ -77,6 +78,10 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService { public PageResult getIssueRequestMainPage(IssueRequestMainPageReqVO pageReqVO) { return issueRequestMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getIssueRequestMainSenior(CustomConditions conditions) { + return issueRequestMainMapper.selectSenior(conditions); + } @Override public List getIssueRequestMainList(IssueRequestMainExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java index 4fd0153d..fbcfdd28 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.itempackaging; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.itempackaging.vo.*; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; @@ -61,6 +62,14 @@ public interface ItempackagingService { */ PageResult getItempackagingPage(ItempackagingPageReqVO pageReqVO); + /** + * 获得用高级搜索物品包装信息分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getItempackagingSenior(CustomConditions conditions); + /** * 获得物品包装信息 列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java index 76223868..c485e65d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.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.itempackaging.vo.*; @@ -83,7 +84,10 @@ public class ItempackagingServiceImpl implements ItempackagingService { public List getItempackagingList(ItempackagingExportReqVO exportReqVO) { return itempackagingMapper.selectList(exportReqVO); } - + @Override + public PageResult getItempackagingSenior(CustomConditions conditions) { + return itempackagingMapper.selectSenior(conditions); + } @Override public List itempackagingimportDocumentList(List itempackagings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(itempackagings)) { @@ -91,23 +95,55 @@ public class ItempackagingServiceImpl implements ItempackagingService { } List errorList = new ArrayList<>(); itempackagings.forEach(itempackaging -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateItempackagingForCreateOrUpdate(null,itempackaging.getItemCode(),itempackaging.getUom(),itempackaging.getStdPackUnit(),itempackaging.getStdPackQty(),itempackaging.getAvailable());} - } catch (ServiceException ex) { - errorList.add(itempackaging); - return; + if(mode != null){ + try { + validateItempackagingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemCodeExists(null,itempackaging.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateUomExists(itempackaging.getUom()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateStdPackUnitExists(itempackaging.getStdPackUnit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateStdPackQtyExists(itempackaging.getStdPackQty()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(itempackaging.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - ItempackagingDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - itempackagingMapper.insert(ItempackagingConvert.INSTANCE.convert(itempackaging)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(itempackaging); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - ItempackagingDO itempackagingMapperDO = ItempackagingConvert.INSTANCE.convert(itempackaging); - itempackagingMapperDO.setId(existConfigurationSetting.getId()); - itempackagingMapper.updateById(itempackagingMapperDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + ItempackagingDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + itempackagingMapper.insert(ItempackagingConvert.INSTANCE.convert(itempackaging)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + ItempackagingDO itempackagingMapperDO = ItempackagingConvert.INSTANCE.convert(itempackaging); + itempackagingMapperDO.setId(existConfigurationSetting.getId()); + itempackagingMapper.updateById(itempackagingMapperDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java index 84f011f0..43dba645 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.jobsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.jobsetting.vo.*; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; @@ -68,6 +69,13 @@ public interface JobsettingService { * @return 任务设置列表 */ List getJobsettingList(JobsettingExportReqVO exportReqVO); + /** + * 获得用高级搜索任务设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getJobsettingSenior(CustomConditions conditions); List importJobsettingList(List jobsettings, Integer mode, Boolean updatePart); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java index aa7e170e..a08a7c39 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.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.jobsetting.vo.*; @@ -84,7 +85,10 @@ public class JobsettingServiceImpl implements JobsettingService { public List getJobsettingList(JobsettingExportReqVO exportReqVO) { return jobsettingMapper.selectList(exportReqVO); } - + @Override + public PageResult getJobsettingSenior(CustomConditions conditions) { + return jobsettingMapper.selectSenior(conditions); + } @Override public List importJobsettingList(List jobsettings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(jobsettings)) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java index 3434b86d..fa2e7120 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.labeltype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.labeltype.vo.LabeltypeCreateReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; @@ -63,6 +64,13 @@ public interface LabeltypeService { * @return 标签定义分页 */ PageResult getLabeltypePage(LabeltypePageReqVO pageReqVO); + /** + * 获得用高级搜索标签定义分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLabeltypeSenior(CustomConditions conditions); /** * 获得标签定义列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java index 1e2740f3..c64b9919 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.labeltype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.labeltype.vo.LabeltypeCreateReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; @@ -79,7 +80,10 @@ public class LabeltypeServiceImpl implements LabeltypeService { public PageResult getLabeltypePage(LabeltypePageReqVO pageReqVO) { return labletypeMapper.selectPage(pageReqVO); } - + @Override + public PageResult getLabeltypeSenior(CustomConditions conditions) { + return labletypeMapper.selectSenior(conditions); + } @Override public List getLabeltypeList(LabeltypeExportReqVO exportReqVO) { return labletypeMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index 39aaa3d7..3e88c52a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -1,13 +1,11 @@ package com.win.module.wms.service.location; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.location.vo.*; -import com.win.module.wms.controller.rule.vo.RuleRespVO; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import javax.validation.Valid; -import java.math.BigDecimal; import java.util.Collection; import java.util.List; @@ -64,6 +62,14 @@ public interface LocationService { */ PageResult getLocationPage(LocationPageReqVO pageReqVO); + /** + * 获得用高级搜索库位分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLocationSenior(CustomConditions conditions); + /** * 获得库位列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index ca3b6c57..f53e1269 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -4,17 +4,13 @@ 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.ErrorCode; 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.location.vo.*; -import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.location.LocationConvert; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; import com.win.module.wms.dal.mysql.location.LocationMapper; @@ -22,7 +18,6 @@ import com.win.module.wms.service.rule.RuleService; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; import javax.annotation.Resource; import java.math.BigDecimal; @@ -105,6 +100,10 @@ public class LocationServiceImpl implements LocationService { return locationMapper.selectList(exportReqVO); } + @Override + public PageResult getLocationSenior(CustomConditions conditions) { + return locationMapper.selectSenior(conditions); + } @Override public List importLocationList(List locations, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(locations)) { @@ -112,25 +111,76 @@ public class LocationServiceImpl implements LocationService { } List errorList = new ArrayList<>(); locations.forEach(location -> { + String massage = ""; + // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateLocationForCreateOrUpdate(null,location.getCode(),location.getAreaCode(),location.getWarehouseCode() - ,location.getLocationGroupCode(),location.getErpLocationCode(),location.getType(),location.getPickPriority() - ,location.getUserGroupCode(),location.getAvailable());} - } catch (ServiceException ex) { - errorList.add(location); - return; + if(mode != null){ + try { + validateLocationExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,location.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateWarehouseCodeExists(location.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAreaCodeExists(location.getAreaCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateErpLocationCodeExists(location.getErpLocationCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateLocationGroupCodeExists(location.getUserGroupCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateTypeExists(location.getType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePickPriorityExists(location.getPickPriority()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateUserGroupCodeExists(location.getUserGroupCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(location.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - LocationDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - locationMapper.insert(LocationConvert.INSTANCE.convert(location)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(location); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - LocationDO locationDO = LocationConvert.INSTANCE.convert(location); - locationDO.setId(existConfigurationSetting.getId()); - locationMapper.updateById(locationDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + LocationDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + locationMapper.insert(LocationConvert.INSTANCE.convert(location)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + LocationDO locationDO = LocationConvert.INSTANCE.convert(location); + locationDO.setId(existConfigurationSetting.getId()); + locationMapper.updateById(locationDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java index f00803ad..db427886 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.locationcapacity; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityCreateReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityExportReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO; @@ -63,6 +64,14 @@ public interface LocationcapacityService { */ PageResult getLocationcapacityPage(LocationcapacityPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLocationcapacitySenior(CustomConditions conditions); + /** * 获得库位容量列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java index 0b384c44..aad118e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.locationcapacity; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityCreateReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityExportReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO; @@ -81,6 +82,10 @@ public class LocationcapacityServiceImpl implements LocationcapacityService { return locationcapacityMapper.selectPage(pageReqVO); } + @Override + public PageResult getLocationcapacitySenior(CustomConditions conditions) { + return locationcapacityMapper.selectSenior(conditions); + } @Override public List getLocationcapacityList(LocationcapacityExportReqVO exportReqVO) { return locationcapacityMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java index 66d3c308..bb6bae5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.locationgroup; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.locationgroup.vo.*; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; @@ -61,6 +62,15 @@ public interface LocationgroupService { */ PageResult getLocationgroupPage(LocationgroupPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLocationgroupSenior(CustomConditions conditions); + + /** * 获得库位组列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java index 21d5d814..ee11cc1c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.locationgroup.vo.*; @@ -83,7 +84,10 @@ public class LocationgroupServiceImpl implements LocationgroupService { public List getLocationgroupList(LocationgroupExportReqVO exportReqVO) { return locationgroupMapper.selectList(exportReqVO); } - + @Override + public PageResult getLocationgroupSenior(CustomConditions conditions) { + return locationgroupMapper.selectSenior(conditions); + } @Override public List importLocationGroupList(List locationGroups, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(locationGroups)) { @@ -92,23 +96,48 @@ public class LocationgroupServiceImpl implements LocationgroupService { List errorList = new ArrayList<>(); locationGroups.forEach(locationGroup -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateLocationForCreateOrUpdate(null,locationGroup.getCode(),locationGroup.getAreaCode(), - locationGroup.getWarehouseCode(),locationGroup.getAvailable());} - } catch (ServiceException ex) { - errorList.add(locationGroup); - return; + String massage = ""; + if(mode != null){ + try { + validateLocationgroupExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,locationGroup.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateWarehouseCodeExists(locationGroup.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAreaCodeExists(locationGroup.getAreaCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(locationGroup.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - LocationgroupDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - locationgroupMapper.insert(LocationConvert.INSTANCE.convert(locationGroup)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(locationGroup); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - LocationgroupDO locationgroupDO = LocationConvert.INSTANCE.convert(locationGroup); - locationgroupDO.setId(existConfigurationSetting.getId()); - locationgroupMapper.updateById(locationgroupDO); + if(errorList == null){ + LocationgroupDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + locationgroupMapper.insert(LocationConvert.INSTANCE.convert(locationGroup)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + LocationgroupDO locationgroupDO = LocationConvert.INSTANCE.convert(locationGroup); + locationgroupDO.setId(existConfigurationSetting.getId()); + locationgroupMapper.updateById(locationgroupDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java index 114a7e99..d888dee1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRecordDetailService { */ PageResult getOfflinesettlementRecordDetailPage(OfflinesettlementRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算记录子分页 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRecordDetailSenior(CustomConditions conditions); + /** * 获得下线结算记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java index d0a4420c..16f7dda2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO; @@ -73,6 +74,10 @@ public class OfflinesettlementRecordDetailServiceImpl implements Offlinesettleme return offlinesettlementRecordDetailMapper.selectBatchIds(ids); } + @Override + public PageResult getOfflinesettlementRecordDetailSenior(CustomConditions conditions) { + return offlinesettlementRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getOfflinesettlementRecordDetailPage(OfflinesettlementRecordDetailPageReqVO pageReqVO) { return offlinesettlementRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java index d31e58d8..33838e2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRecordMainService { */ PageResult getOfflinesettlementRecordMainPage(OfflinesettlementRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRecordMainSenior(CustomConditions conditions); + /** * 获得下线结算记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java index 9e9b5b58..2123ae23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class OfflinesettlementRecordMainServiceImpl implements Offlinesettlement public PageResult getOfflinesettlementRecordMainPage(OfflinesettlementRecordMainPageReqVO pageReqVO) { return offlinesettlementRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOfflinesettlementRecordMainSenior(CustomConditions conditions) { + return offlinesettlementRecordMainMapper.selectSenior(conditions); + } @Override public List getOfflinesettlementRecordMainList(OfflinesettlementRecordMainExportReqVO exportReqVO) { return offlinesettlementRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java index 484bee8e..ea0ddd1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRequestDetailService { */ PageResult getOfflinesettlementRequestDetailPage(OfflinesettlementRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRequestDetailSenior(CustomConditions conditions); + /** * 获得下线结算申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java index 0c664e60..65765983 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO; @@ -73,6 +74,10 @@ public class OfflinesettlementRequestDetailServiceImpl implements Offlinesettlem return offlinesettlementRequestDetailMapper.selectBatchIds(ids); } + @Override + public PageResult getOfflinesettlementRequestDetailSenior(CustomConditions conditions) { + return offlinesettlementRequestDetailMapper.selectSenior(conditions); + } @Override public PageResult getOfflinesettlementRequestDetailPage(OfflinesettlementRequestDetailPageReqVO pageReqVO) { return offlinesettlementRequestDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java index 23e3b682..a53a2e55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRequestMainService { */ PageResult getOfflinesettlementRequestMainPage(OfflinesettlementRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRequestMainSenior(CustomConditions conditions); + /** * 获得下线结算申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java index ed50ddee..2e33abd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO; @@ -73,6 +74,10 @@ public class OfflinesettlementRequestMainServiceImpl implements Offlinesettlemen return offlinesettlementRequestMainMapper.selectBatchIds(ids); } + @Override + public PageResult getOfflinesettlementRequestMainSenior(CustomConditions conditions) { + return offlinesettlementRequestMainMapper.selectSenior(conditions); + } @Override public PageResult getOfflinesettlementRequestMainPage(OfflinesettlementRequestMainPageReqVO pageReqVO) { return offlinesettlementRequestMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java index c3e20099..f7080c15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OnlinesettlementRecordDetailService { */ PageResult getOnlinesettlementRecordDetailPage(OnlinesettlementRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索上线结算记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRecordDetailSenior(CustomConditions conditions); + /** * 获得上线结算记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java index 2fa6fc1e..6ce795c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class OnlinesettlementRecordDetailServiceImpl implements Onlinesettlement public PageResult getOnlinesettlementRecordDetailPage(OnlinesettlementRecordDetailPageReqVO pageReqVO) { return onlinesettlementRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOnlinesettlementRecordDetailSenior(CustomConditions conditions) { + return onlinesettlementRecordDetailMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRecordDetailList(OnlinesettlementRecordDetailExportReqVO exportReqVO) { return onlinesettlementRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java index 4aafb6dd..b8c1587a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO; @@ -55,6 +56,14 @@ public interface OnlinesettlementRecordMainService { */ List getOnlinesettlementRecordMainList(Collection ids); + /** + * 获得用高级搜索上线结算记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRecordMainSenior(CustomConditions conditions); + /** * 获得上线结算记录主分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java index 79b4e68c..4c3ea744 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class OnlinesettlementRecordMainServiceImpl implements OnlinesettlementRe public PageResult getOnlinesettlementRecordMainPage(OnlinesettlementRecordMainPageReqVO pageReqVO) { return onlinesettlementRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOnlinesettlementRecordMainSenior(CustomConditions conditions) { + return onlinesettlementRecordMainMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRecordMainList(OnlinesettlementRecordMainExportReqVO exportReqVO) { return onlinesettlementRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java index a55a6578..086dcaa9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OnlinesettlementRequestDetailService { */ PageResult getOnlinesettlementRequestDetailPage(OnlinesettlementRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索上线结算申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRequestDetailSenior(CustomConditions conditions); + /** * 获得上线结算申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java index cd28d276..7c1f0cb2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class OnlinesettlementRequestDetailServiceImpl implements Onlinesettlemen public PageResult getOnlinesettlementRequestDetailPage(OnlinesettlementRequestDetailPageReqVO pageReqVO) { return onlinesettlementRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOnlinesettlementRequestDetailSenior(CustomConditions conditions) { + return onlinesettlementRequestDetailMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRequestDetailList(OnlinesettlementRequestDetailExportReqVO exportReqVO) { return onlinesettlementRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java index 83b6186d..41c59390 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface OnlinesettlementRequestMainService { */ PageResult getOnlinesettlementRequestMainPage(OnlinesettlementRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRequestMainSenior(CustomConditions conditions); + /** * 获得上线结算申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java index 4237e827..80836bb3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO; @@ -78,6 +79,10 @@ public class OnlinesettlementRequestMainServiceImpl implements OnlinesettlementR return onlinesettlementRequestMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getOnlinesettlementRequestMainSenior(CustomConditions conditions) { + return onlinesettlementRequestMainMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRequestMainList(OnlinesettlementRequestMainExportReqVO exportReqVO) { return onlinesettlementRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java index 89c27baa..3deb2757 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.owner; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.owner.vo.*; import com.win.module.wms.dal.dataobject.owner.OwnerDO; @@ -61,6 +62,14 @@ public interface OwnerService { */ PageResult getOwnerPage(OwnerPageReqVO pageReqVO); + /** + * 获得用高级搜索货主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOwnerSenior(CustomConditions conditions); + /** * 获得货主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java index cdce5124..72245be3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java @@ -4,10 +4,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.owner.vo.*; +import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; import com.win.module.wms.convert.owner.OwnerConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.mysql.owner.OwnerMapper; import org.springframework.stereotype.Service; @@ -80,7 +83,10 @@ public class OwnerServiceImpl implements OwnerService { public List getOwnerList(OwnerExportReqVO exportReqVO) { return ownerMapper.selectList(exportReqVO); } - + @Override + public PageResult getOwnerSenior(CustomConditions conditions) { + return ownerMapper.selectSenior(conditions); + } @Override public List importOwnerList(List owners, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(owners)) { @@ -88,23 +94,45 @@ public class OwnerServiceImpl implements OwnerService { } List errorList = new ArrayList<>(); owners.forEach(owner -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateLocationForCreateOrUpdate(null,owner.getCode(),owner.getShortName(),owner.getAvailable());} - } catch (ServiceException ex) { - errorList.add(owner); - return; + if(mode != null){ + try { + validateOwnerExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,owner.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateShortNameExists(owner.getShortName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(owner.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - ownerMapper.insert(OwnerConvert.INSTANCE.convert(owner)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(owner); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - OwnerDO ownerDO = OwnerConvert.INSTANCE.convert(owner); - ownerDO.setId(existConfigurationSetting.getId()); - ownerMapper.updateById(ownerDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + OwnerDO existOwner = new OwnerDO(); + if (existOwner == null&& mode != 3) { + ownerMapper.insert(OwnerConvert.INSTANCE.convert(owner)); + } + else if (existOwner != null && mode != 2) {// 如果存在，判断是否允许更新 + OwnerDO ownerDO = OwnerConvert.INSTANCE.convert(owner); + ownerDO.setId(existOwner.getId()); + ownerMapper.updateById(ownerDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java index e00fceb1..cc1528f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java @@ -379,10 +379,35 @@ public class JobUtils { } } + /** + * TB------TB4 + * 先获取管理模式，再根据管理模式查询库存余额，返回查询结果 + * @param itemcode 零件号 + * @param packingnumber 包装号 + * @param batch 批次 + * @param locationcode 库位号 + * @param inventoryStatus 入库库存状态 + * @return + */ + public List selectlocationReturnManagementAccuracyToBalance(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { + RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, + null, locationcode, null, null); + List balanceDO = null; + if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); + }else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); + }else if("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); + }else if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); + } + return balanceDO; + } /** * TB-------TB1 * 查询库存返回管理精度 - * + * 先获取管理模式，再根据管理模式查询库存余额，返回校验结果 * @param itemcode 零件号 * @param packingnumber 包装号 * @param batch 批次 @@ -391,18 +416,38 @@ public class JobUtils { * @return * @author lianhongxi */ - public List selectlocation(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus) { + public List selectlocationReturnManagementAccuracy(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, null, locationcode, null, null); List balanceDO = null; if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); - } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { + if(balanceDO == null){ + throw new UtilException( "物品代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } + }else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); - } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { + if(balanceDO == null){ + throw new UtilException( "物品代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } + }else if("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); - } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { + if(balanceDO == null){ + throw new UtilException( "物品代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } + }else if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); + if(balanceDO == null){ + throw new UtilException( "唯一码" + packingnumber + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } } return balanceDO; } @@ -422,7 +467,7 @@ public class JobUtils { * @return * @author lianhongxi */ - public List selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus) { + public List selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, null, locationcode, null, null); List expectoutDO = null; @@ -451,8 +496,8 @@ public class JobUtils { * @return * @author lianhongxi */ - public BigDecimal CountLocaltion(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus) { - List balanceDO = selectlocation(itemcode, packingnumber, batch, locationcode, inventoryStatus); + public BigDecimal CountLocaltion(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { + List balanceDO = selectlocationReturnManagementAccuracy(itemcode, packingnumber, batch, locationcode, inventoryStatus); List expectoutDO = selectLocatioNew(itemcode, packingnumber, batch, locationcode, inventoryStatus); BigDecimal esum = BigDecimal.valueOf(expectoutDO.stream().mapToDouble(expectoutDO1 -> expectoutDO1.getQty().doubleValue()).sum()); BigDecimal bsum = BigDecimal.valueOf(balanceDO.stream().mapToDouble(balanceDO1 -> balanceDO1.getQty().doubleValue()).sum()); @@ -472,7 +517,7 @@ public class JobUtils { * @return * @author lianhongxi */ - public String LocaltionExist(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus, BigDecimal requstqty) { + public String LocaltionExist(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus, BigDecimal requstqty) { BigDecimal enableqty = CountLocaltion(itemcode, packingnumber, batch, locationcode, inventoryStatus); if (requstqty.compareTo(enableqty) > 0) { throw exception(new ErrorCode(1256, "请求数量" + requstqty + "大于库存数量" + enableqty)); @@ -494,12 +539,12 @@ public class JobUtils { } //库存不应该存在 - public List locationNoExist(String itemcode, String packingnumber, String locationcode, String inventorystatus) { + public List locationNoExist(String itemcode, String packingnumber, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, null, locationcode, null, null); List balanceDO = null; if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventorystatus); + balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); return balanceDO; } else { throw exception(new ErrorCode(1256, "校验通过")); @@ -519,7 +564,7 @@ public class JobUtils { } //从库位未被其他任务占用，有可用库存 - public String locationExistnew(String itemcode, String packingnumber, String batch, String fromlocationcode, String inventoryStatus, BigDecimal requstqty) { + public String locationExistnew(String itemcode, String packingnumber, String batch, String fromlocationcode, List inventoryStatus, BigDecimal requstqty) { if (fromlocationcode.isEmpty()) { return "不需要其他校验"; } @@ -539,12 +584,12 @@ public class JobUtils { * @param pitemcode 零件号 * @param ppackingnumber 包装号 * @param pbatch 批次 - * @param pinventorystatus 入库库存状态 + * @param pinventoryStatus 入库库存状态 * @param plocationcode 库位号 * @return * @author lianhongxi */ - public List selectExpectort(String pitemcode, String ppackingnumber, String pbatch, String pinventorystatus, String plocationcode) { + public List selectExpectort(String pitemcode, String ppackingnumber, String pbatch, List pinventoryStatus, String plocationcode) { RuleRespVO management = ruleService.management(null, null, null, null, null, null, pitemcode, null, null, null, plocationcode, null, null); List expectoutDO = null; @@ -552,13 +597,13 @@ public class JobUtils { String[] splits = management.getConfiguration().split("\""); for (String split : splits) { if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(management.getConfiguration())) { - expectoutService.selectNumberNew(pitemcode, pinventorystatus, plocationcode); + expectoutService.selectNumberNew(pitemcode, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectBatchNew(pitemcode, pbatch, pinventorystatus, plocationcode); + expectoutDO = expectoutService.selectBatchNew(pitemcode, pbatch, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectPackingNew(pitemcode, ppackingnumber, pbatch, pinventorystatus, plocationcode); + expectoutDO = expectoutService.selectPackingNew(pitemcode, ppackingnumber, pbatch, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectUniqeIdNew(ppackingnumber, plocationcode, pinventorystatus); + expectoutDO = expectoutService.selectUniqeIdNew(ppackingnumber, plocationcode, pinventoryStatus); } return expectoutDO; } @@ -579,10 +624,10 @@ public class JobUtils { * @param inventoryStatus * @return */ - public List numAndJobIsSame(String itemCode, String packingNumber, String batch, String locationCode, String inventoryStatus) { + public List numAndJobIsSame(String itemCode, String packingNumber, String batch, String locationCode, List inventoryStatus) { List balanceDOList = new ArrayList<>(); try { - balanceDOList = selectlocation(itemCode, packingNumber, batch, locationCode, inventoryStatus); + balanceDOList = selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, locationCode, inventoryStatus); } catch (Exception e) { throw exception(new ErrorCode(1256, "接口调用异常,请重试")); } @@ -601,10 +646,10 @@ public class JobUtils { * @param inventoryStatus * @return */ - public List fromInventoryEffective(String itemCode, String packingNumber, String batch, String locationCode, String inventoryStatus) { + public List fromInventoryEffective(String itemCode, String packingNumber, String batch, String locationCode, List inventoryStatus) { List balanceDOList = new ArrayList<>(); try { - balanceDOList = selectlocation(itemCode, packingNumber, batch, locationCode, inventoryStatus); + balanceDOList = selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, locationCode, inventoryStatus); } catch (Exception e) { throw exception(new ErrorCode(1256, "接口调用异常,请重试")); } @@ -622,7 +667,7 @@ public class JobUtils { * @param inventoryStatus * @return */ - public Boolean fromInventoryEffectiveCustomer(String locationCode, String itemCode, String packingNumber, String batch, String inventoryStatus) { + public Boolean fromInventoryEffectiveCustomer(String locationCode, String itemCode, String packingNumber, String batch, List inventoryStatus) { Boolean returnRes = false; List balanceDOList = new ArrayList<>(); try { From e7340c0e90eb5fe8ea5cb37a3250bcf8e4d861e9 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Mon, 30 Oct 2023 15:49:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageMassage/PackageController.java | 58 +++++++++++-------- .../packageMassage/vo/PackageBaseVO.java | 17 +++--- .../paramsetting/ParamsettingController.java | 15 +++++ .../paramsetting/vo/ParamsettingBaseVO.java | 9 ++- .../pickJob/PickJobDetailController.java | 54 ++++++++++------- .../pickJob/PickJobMainController.java | 54 ++++++++++------- .../pickJob/vo/PickJobDetailBaseVO.java | 11 ++-- .../PickRecordDetailController.java | 53 ++++++++++------- .../pickRecord/PickRecordMainController.java | 53 ++++++++++------- .../PickRequestDetailController.java | 54 ++++++++++------- .../PickRequestMainController.java | 54 ++++++++++------- .../PreparetoissueDetailController.java | 54 ++++++++++------- .../PreparetoissueMainController.java | 53 ++++++++++------- .../controller/process/ProcessController.java | 16 +++++ .../ProductdismantleJobDetailController.java | 55 +++++++++++------- .../ProductdismantleJobMainController.java | 53 ++++++++++------- ...oductdismantleRecordDetailaController.java | 54 ++++++++++------- ...ductdismantleRequestDetailaController.java | 54 ++++++++++------- ...ductdismantleRequestDetailbController.java | 16 +++++ ...ProductdismantleRequestMainController.java | 54 ++++++++++------- .../ProductionDetailController.java | 54 ++++++++++------- .../production/ProductionMainController.java | 54 ++++++++++------- .../ProductionlineController.java | 16 ++++- .../ProductionlineitemController.java | 16 ++++- .../ProductionreceiptJobDetailController.java | 54 ++++++++++------- .../ProductionreceiptJobMainController.java | 54 ++++++++++------- ...oductionreceiptRecordDetailController.java | 54 ++++++++++------- ...ProductionreceiptRecordMainController.java | 54 ++++++++++------- .../ProductionreturnJobDetailController.java | 54 ++++++++++------- .../ProductionreturnJobMainController.java | 54 ++++++++++------- ...roductionreturnRecordDetailController.java | 54 ++++++++++------- .../ProductionreturnRecordMainController.java | 55 +++++++++++------- ...oductionreturnRequestDetailController.java | 54 ++++++++++------- ...ProductionreturnRequestMainController.java | 54 ++++++++++------- .../ProductputawayJobDetailController.java | 54 ++++++++++------- .../ProductputawayJobMainController.java | 54 ++++++++++------- .../ProductputawayRecordDetailController.java | 54 ++++++++++------- .../ProductputawayRecordMainController.java | 54 ++++++++++------- ...ProductputawayRequestDetailController.java | 54 ++++++++++------- .../ProductputawayRequestMainController.java | 54 ++++++++++------- .../ProductreceiptJobDetailController.java | 55 +++++++++++------- .../ProductreceiptJobMainController.java | 58 ++++++++++++------- .../BackflushRecordDetailbController.java | 19 ++++++ .../ProductreceiptRecordDetailController.java | 57 +++++++++++------- .../ProductreceiptRecordMainController.java | 57 +++++++++++------- ...ProductreceiptRequestDetailController.java | 56 +++++++++++------- .../ProductreceiptRequestMainController.java | 56 +++++++++++------- .../ConsumeRecordDetailbController.java | 14 +++++ .../ProductrepairRecordDetailController.java | 57 +++++++++++------- .../ProductrepairRecordMainController.java | 53 ++++++++++------- ...ProductrepairRequestDetailaController.java | 54 ++++++++++------- ...ProductrepairRequestDetailbController.java | 14 +++++ .../ProductrepairRequestMainController.java | 57 +++++++++++------- .../mysql/packageMassage/PackageMapper.java | 12 +++- .../paramsetting/ParamsettingMapper.java | 12 +++- .../mysql/pickJob/PickJobDetailMapper.java | 12 +++- .../dal/mysql/pickJob/PickJobMainMapper.java | 12 +++- .../pickRecord/PickRecordDetailMapper.java | 11 +++- .../pickRecord/PickRecordMainMapper.java | 12 +++- .../pickRequest/PickRequestDetailMapper.java | 6 ++ .../pickRequest/PickRequestMainMapper.java | 7 +++ .../PreparetoissueDetailMapper.java | 6 ++ .../PreparetoissueMainMapper.java | 12 +++- .../wms/dal/mysql/process/ProcessMapper.java | 7 +++ .../ProductdismantleJobDetailMapper.java | 12 +++- .../ProductdismantleJobMainMapper.java | 12 +++- .../ProductdismantleRecordDetailaMapper.java | 12 +++- .../ProductdismantleRecordDetailbMapper.java | 1 + .../ProductdismantleRequestDetailaMapper.java | 12 +++- .../ProductdismantleRequestDetailbMapper.java | 6 ++ .../ProductdismantleRequestMainMapper.java | 12 +++- .../production/ProductionDetailMapper.java | 12 +++- .../production/ProductionMainMapper.java | 13 +++-- .../productionline/ProductionlineMapper.java | 6 ++ .../ProductionlineitemMapper.java | 12 ++-- .../ProductionreceiptJobDetailMapper.java | 12 +++- .../ProductionreceiptJobMainMapper.java | 12 +++- .../ProductionreceiptRecordDetailMapper.java | 12 +++- .../ProductionreceiptRecordMainMapper.java | 12 +++- .../ProductionreturnJobDetailMapper.java | 12 +++- .../ProductionreturnJobMainMapper.java | 12 +++- .../ProductionreturnRecordDetailMapper.java | 11 +++- .../ProductionreturnRecordMainMapper.java | 12 +++- .../ProductionreturnRequestDetailMapper.java | 12 +++- .../ProductionreturnRequestMainMapper.java | 12 ++-- .../ProductputawayJobDetailMapper.java | 12 +++- .../ProductputawayJobMainMapper.java | 12 +++- .../ProductputawayRecordDetailMapper.java | 12 +++- .../ProductputawayRecordMainMapper.java | 12 +++- .../ProductputawayRequestDetailMapper.java | 12 +++- .../ProductputawayRequestMainMapper.java | 12 +++- .../ProductreceiptJobDetailMapper.java | 12 +++- .../ProductreceiptJobMainMapper.java | 12 +++- .../BackflushRecordDetailbMapper.java | 6 ++ .../ProductreceiptRecordDetailMapper.java | 12 +++- .../ProductreceiptRecordMainMapper.java | 12 +++- .../ProductreceiptRequestDetailMapper.java | 12 +++- .../ProductreceiptRequestMainMapper.java | 12 +++- .../ConsumeRecordDetailbMapper.java | 6 ++ .../ProductrepairRecordDetailMapper.java | 12 +++- .../ProductrepairRecordMainMapper.java | 12 +++- .../ProductrepairRequestDetailaMapper.java | 11 +++- .../ProductrepairRequestMainMapper.java | 12 +++- .../AccountcalendarService.java | 1 + .../packageMassage/PackageService.java | 18 ++++-- .../packageMassage/PackageServiceImpl.java | 24 +++++--- .../paramsetting/ParamsettingService.java | 9 +++ .../paramsetting/ParamsettingServiceImpl.java | 6 ++ .../service/pickJob/PickJobDetailService.java | 17 ++++-- .../pickJob/PickJobDetailServiceImpl.java | 23 +++++--- .../service/pickJob/PickJobMainService.java | 18 ++++-- .../pickJob/PickJobMainServiceImpl.java | 25 ++++---- .../pickRecord/PickRecordDetailService.java | 18 ++++-- .../PickRecordDetailServiceImpl.java | 22 ++++--- .../pickRecord/PickRecordMainService.java | 17 ++++-- .../pickRecord/PickRecordMainServiceImpl.java | 23 +++++--- .../pickRequest/PickRequestDetailService.java | 10 ++++ .../PickRequestDetailServiceImpl.java | 6 ++ .../pickRequest/PickRequestMainService.java | 9 +++ .../PickRequestMainServiceImpl.java | 6 ++ .../PreparetoissueDetailService.java | 19 ++++-- .../PreparetoissueDetailServiceImpl.java | 23 +++++--- .../PreparetoissueMainService.java | 19 ++++-- .../PreparetoissueMainServiceImpl.java | 23 +++++--- .../wms/service/process/ProcessService.java | 10 ++++ .../service/process/ProcessServiceImpl.java | 6 ++ .../ProductdismantleJobDetailService.java | 18 ++++-- .../ProductdismantleJobDetailServiceImpl.java | 21 ++++--- .../ProductdismantleJobMainService.java | 17 ++++-- .../ProductdismantleJobMainServiceImpl.java | 26 +++++---- .../ProductdismantleRecordDetailaService.java | 19 ++++-- ...ductdismantleRecordDetailaServiceImpl.java | 22 ++++--- .../ProductdismantleRecordDetailbService.java | 1 - ...ductdismantleRecordDetailbServiceImpl.java | 6 +- ...ProductdismantleRequestDetailaService.java | 19 ++++-- ...uctdismantleRequestDetailaServiceImpl.java | 23 +++++--- ...ProductdismantleRequestDetailbService.java | 8 +++ ...uctdismantleRequestDetailbServiceImpl.java | 7 +++ .../ProductdismantleRequestMainService.java | 18 ++++-- ...roductdismantleRequestMainServiceImpl.java | 23 +++++--- .../production/ProductionDetailService.java | 18 ++++-- .../ProductionDetailServiceImpl.java | 23 +++++--- .../production/ProductionMainService.java | 17 ++++-- .../production/ProductionMainServiceImpl.java | 27 ++++----- .../productionline/ProductionlineService.java | 9 +++ .../ProductionlineServiceImpl.java | 8 +++ .../ProductionlineitemService.java | 10 ++++ .../ProductionlineitemServiceImpl.java | 7 +++ .../ProductionreceiptJobDetailService.java | 17 ++++-- ...ProductionreceiptJobDetailServiceImpl.java | 23 +++++--- .../ProductionreceiptJobMainService.java | 18 ++++-- .../ProductionreceiptJobMainServiceImpl.java | 23 +++++--- .../ProductionreceiptRecordDetailService.java | 17 ++++-- ...ductionreceiptRecordDetailServiceImpl.java | 22 ++++--- .../ProductionreceiptRecordMainService.java | 18 ++++-- ...roductionreceiptRecordMainServiceImpl.java | 22 ++++--- .../ProductionreturnJobDetailService.java | 18 ++++-- .../ProductionreturnJobDetailServiceImpl.java | 23 +++++--- .../ProductionreturnJobMainService.java | 18 ++++-- .../ProductionreturnJobMainServiceImpl.java | 25 ++++---- .../ProductionreturnRecordDetailService.java | 17 ++++-- ...oductionreturnRecordDetailServiceImpl.java | 28 ++++++--- .../ProductionreturnRecordMainService.java | 17 ++++-- ...ProductionreturnRecordMainServiceImpl.java | 23 +++++--- .../ProductionreturnRequestDetailService.java | 17 ++++-- ...ductionreturnRequestDetailServiceImpl.java | 23 +++++--- .../ProductionreturnRequestMainService.java | 17 ++++-- ...roductionreturnRequestMainServiceImpl.java | 23 +++++--- .../ProductputawayJobDetailService.java | 18 ++++-- .../ProductputawayJobDetailServiceImpl.java | 22 ++++--- .../ProductputawayJobMainService.java | 18 ++++-- .../ProductputawayJobMainServiceImpl.java | 25 ++++---- .../ProductputawayRecordDetailService.java | 17 ++++-- ...ProductputawayRecordDetailServiceImpl.java | 23 +++++--- .../ProductputawayRecordMainService.java | 17 ++++-- .../ProductputawayRecordMainServiceImpl.java | 22 ++++--- .../ProductputawayRequestDetailService.java | 17 ++++-- ...roductputawayRequestDetailServiceImpl.java | 23 +++++--- .../ProductputawayRequestMainService.java | 18 ++++-- .../ProductputawayRequestMainServiceImpl.java | 23 +++++--- .../ProductreceiptJobDetailService.java | 17 ++++-- .../ProductreceiptJobDetailServiceImpl.java | 23 +++++--- .../ProductreceiptJobMainService.java | 18 ++++-- .../ProductreceiptJobMainServiceImpl.java | 25 ++++---- .../BackflushRecordDetailbService.java | 8 +++ .../BackflushRecordDetailbServiceImpl.java | 6 ++ .../ProductreceiptRecordDetailService.java | 17 ++++-- ...ProductreceiptRecordDetailServiceImpl.java | 23 +++++--- .../ProductreceiptRecordMainService.java | 17 ++++-- .../ProductreceiptRecordMainServiceImpl.java | 23 +++++--- .../ProductreceiptRequestDetailService.java | 17 ++++-- ...roductreceiptRequestDetailServiceImpl.java | 22 ++++--- .../ProductreceiptRequestMainService.java | 18 ++++-- .../ProductreceiptRequestMainServiceImpl.java | 23 +++++--- .../ConsumeRecordDetailbService.java | 8 +++ .../ConsumeRecordDetailbServiceImpl.java | 6 ++ .../ProductrepairRecordDetailService.java | 17 ++++-- .../ProductrepairRecordDetailServiceImpl.java | 23 +++++--- .../ProductrepairRecordMainService.java | 17 ++++-- .../ProductrepairRecordMainServiceImpl.java | 22 ++++--- .../ProductrepairRequestDetailaService.java | 17 ++++-- ...roductrepairRequestDetailaServiceImpl.java | 23 +++++--- .../ProductrepairRequestDetailbService.java | 7 +++ ...roductrepairRequestDetailbServiceImpl.java | 5 ++ .../ProductrepairRequestMainService.java | 17 ++++-- .../ProductrepairRequestMainServiceImpl.java | 23 +++++--- 206 files changed, 3230 insertions(+), 1557 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java index fc047f03..3c9c630e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java @@ -1,39 +1,33 @@ package com.win.module.wms.controller.packageMassage; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.packageMassage.vo.*; +import com.win.module.wms.convert.packageMassage.PackageConvert; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; -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.service.packageMassage.PackageService; 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.exception.util.ServiceExceptionUtil.exception; 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 static com.win.module.wms.enums.ErrorCodeConstants.PACKAGE_NOT_EXISTS; - -import com.win.module.wms.controller.packageMassage.vo.*; -import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; -import com.win.module.wms.convert.packageMassage.PackageConvert; -import com.win.module.wms.service.packageMassage.PackageService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 包装") @RestController @@ -114,4 +108,18 @@ public class PackageController { ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得包装分页") + @PreAuthorize("@ss.hasPermission('wms:package:query')") + public CommonResult> getPackageSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = packageService.getPackageSenior(conditions); + PageResult result = PackageConvert.INSTANCE.convertPage(pageResult); + for(PackageRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java index f79ee339..88851001 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java @@ -1,17 +1,13 @@ package com.win.module.wms.controller.packageMassage.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** @@ -152,4 +148,7 @@ public class PackageBaseVO { @Schema(description = "体积") private String volume; + @Schema(description = "创建者用户名") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java index 68fa2d12..5cbf98eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.paramsetting; 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; @@ -148,4 +149,18 @@ public class ParamsettingController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得参数设置分页") + @PreAuthorize("@ss.hasPermission('wms:paramsetting:query')") + public CommonResult> getParamsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = paramsettingService.getParamsettingSenior(conditions); + PageResult result = ParamsettingConvert.INSTANCE.convertPage(pageResult); + for(ParamsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java index b14af73f..dcae6046 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java @@ -1,9 +1,9 @@ package com.win.module.wms.controller.paramsetting.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; /** * 参数设置 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -48,4 +48,7 @@ public class ParamsettingBaseVO { @NotNull(message = "必填不能为空") private String isRequired; + @Schema(description = "创建者用户名") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java index 4a06cda4..cc175a3a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickJob; +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.pickJob.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.convert.pickJob.PickJobDetailConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; +import com.win.module.wms.service.pickJob.PickJobDetailService; 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.pickJob.vo.*; -import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; -import com.win.module.wms.convert.pickJob.PickJobDetailConvert; -import com.win.module.wms.service.pickJob.PickJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料任务子") @RestController @@ -109,4 +107,18 @@ public class PickJobDetailController { ExcelUtils.write(response, "拣料任务子.xls", "数据", PickJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:pick-job-detail:query')") + public CommonResult> getPickJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickJobDetailService.getPickJobDetailSenior(conditions); + PageResult result = PickJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PickJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java index da114a53..b29d918e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickJob; +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.pickJob.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.convert.pickJob.PickJobMainConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import com.win.module.wms.service.pickJob.PickJobMainService; 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.pickJob.vo.*; -import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; -import com.win.module.wms.convert.pickJob.PickJobMainConvert; -import com.win.module.wms.service.pickJob.PickJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料任务主") @RestController @@ -108,4 +106,18 @@ public class PickJobMainController { ExcelUtils.write(response, "拣料任务主.xls", "数据", PickJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料任务主分页") + @PreAuthorize("@ss.hasPermission('wms:pick-job-main:query')") + public CommonResult> getPickJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickJobMainService.getPickJobMainSenior(conditions); + PageResult result = PickJobMainConvert.INSTANCE.convertPage(pageResult); + for(PickJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java index ce22a9e8..fc8286f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java @@ -1,12 +1,12 @@ package com.win.module.wms.controller.pickJob.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +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; @@ -83,4 +83,7 @@ public class PickJobDetailBaseVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "创建者用户名") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java index 123be98d..33b6d4cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRecord; +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.pickRecord.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.convert.pickRecord.PickRecordDetailConvert; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; +import com.win.module.wms.service.pickRecord.PickRecordDetailService; 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.pickRecord.vo.*; -import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; -import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; -import com.win.module.wms.service.pickRecord.PickRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料记录子") @RestController @@ -109,4 +107,17 @@ public class PickRecordDetailController { ExcelUtils.write(response, "拣料记录子.xls", "数据", PickRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:pick-record-detail:query')") + public CommonResult> getPickRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRecordDetailService.getPickRecordDetailSenior(conditions); + PageResult result = PickRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PickRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java index b4745fc2..e6bcf7a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRecord; +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.pickRecord.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.convert.pickRecord.PickRecordMainConvert; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; +import com.win.module.wms.service.pickRecord.PickRecordMainService; 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.pickRecord.vo.*; -import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; -import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; -import com.win.module.wms.service.pickRecord.PickRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料记录主") @RestController @@ -109,4 +107,17 @@ public class PickRecordMainController { ExcelUtils.write(response, "拣料记录主.xls", "数据", PickRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:pick-record-main:query')") + public CommonResult> getPickRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRecordMainService.getPickRecordMainSenior(conditions); + PageResult result = PickRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PickRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java index ea5740b0..9f20f017 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRequest; +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.pickRequest.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.convert.pickRequest.PickRequestDetailConvert; +import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; +import com.win.module.wms.service.pickRequest.PickRequestDetailService; 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.pickRequest.vo.*; -import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; -import com.win.module.wms.convert.pickRequest.PickRequestDetailConvert; -import com.win.module.wms.service.pickRequest.PickRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料申请子") @RestController @@ -109,4 +107,18 @@ public class PickRequestDetailController { ExcelUtils.write(response, "拣料申请子.xls", "数据", PickRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料申请子分页") + @PreAuthorize("@ss.hasPermission('wms:pick-request-detail:query')") + public CommonResult> getPickRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRequestDetailService.getPickRequestDetailSenior(conditions); + PageResult result = PickRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PickRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java index 4173d244..63f3cbd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRequest; +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.pickRequest.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.convert.pickRequest.PickRequestMainConvert; +import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; +import com.win.module.wms.service.pickRequest.PickRequestMainService; 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.pickRequest.vo.*; -import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; -import com.win.module.wms.convert.pickRequest.PickRequestMainConvert; -import com.win.module.wms.service.pickRequest.PickRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料申请主") @RestController @@ -109,4 +107,18 @@ public class PickRequestMainController { ExcelUtils.write(response, "拣料申请主.xls", "数据", PickRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料申请主分页") + @PreAuthorize("@ss.hasPermission('wms:pick-request-main:query')") + public CommonResult> getPickRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRequestMainService.getPickRequestMainSenior(conditions); + PageResult result = PickRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PickRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java index a5db71a0..a806644d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.preparetoissue; +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.preparetoissue.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.convert.preparetoissue.PreparetoissueDetailConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; +import com.win.module.wms.service.preparetoissue.PreparetoissueDetailService; 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.preparetoissue.vo.*; -import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; -import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; -import com.win.module.wms.service.preparetoissue.PreparetoissueDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备料计划子") @RestController @@ -109,4 +107,18 @@ public class PreparetoissueDetailController { ExcelUtils.write(response, "备料计划子.xls", "数据", PreparetoissueDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得备料计划子分页") + @PreAuthorize("@ss.hasPermission('wms:preparetoissue-detail:query')") + public CommonResult> getPreparetoissueDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = preparetoissueDetailService.getPreparetoissueDetailSenior(conditions); + PageResult result = PreparetoissueDetailConvert.INSTANCE.convertPage(pageResult); + for(PreparetoissueDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java index a3ad13c7..b295f232 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java @@ -1,33 +1,32 @@ package com.win.module.wms.controller.preparetoissue; +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.preparetoissue.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.convert.preparetoissue.PreparetoissueMainConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; +import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; 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.dal.dataobject.preparetoissue.PreparetoissueMainDO; -import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; -import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备料计划主") @RestController @@ -107,4 +106,18 @@ public class PreparetoissueMainController { ExcelUtils.write(response, "备料计划主.xls", "数据", PreparetoissueMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得备料计划主分页") + @PreAuthorize("@ss.hasPermission('wms:preparetoissue-main:query')") + public CommonResult> getPreparetoissueMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = preparetoissueMainService.getPreparetoissueMainSenior(conditions); + PageResult result = PreparetoissueMainConvert.INSTANCE.convertPage(pageResult); + for(PreparetoissueMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java index 4eeaf2a5..7521584a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.process; 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; @@ -145,4 +146,19 @@ public class ProcessController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得工序分页") + @PreAuthorize("@ss.hasPermission('wms:process:query')") + public CommonResult> getProcessSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = processService.getProcessSenior(conditions); + PageResult result = ProcessConvert.INSTANCE.convertPage(pageResult); + for(ProcessRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java index bbe8daab..191c7c9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleJob; +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.productdismantleJob.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.convert.productdismantleJob.ProductdismantleJobDetailConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService; 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.productdismantleJob.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; -import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解任务子") @RestController @@ -108,5 +106,20 @@ public class ProductdismantleJobDetailController { } ExcelUtils.write(response, "制品拆解任务子.xls", "数据", ProductdismantleJobDetailExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-detail:query')") + public CommonResult> getProductdismantleJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleJobDetailService.getProductdismantleJobDetailSenior(conditions); + PageResult result = ProductdismantleJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java index 35d852aa..0fcb2706 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java @@ -1,33 +1,32 @@ package com.win.module.wms.controller.productdismantleJob; +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.productdismantleJob.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.convert.productdismantleJob.ProductdismantleJobMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; 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.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; -import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解任务主") @RestController @@ -108,4 +107,18 @@ public class ProductdismantleJobMainController { ExcelUtils.write(response, "制品拆解任务主.xls", "数据", ProductdismantleJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')") + public CommonResult> getProductdismantleJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleJobMainService.getProductdismantleJobMainSenior(conditions); + PageResult result = ProductdismantleJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java index 36e3d75a..3c76e9a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java @@ -1,34 +1,32 @@ 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 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.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; +import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService; 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.productdismantleRecord.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; -import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; -import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解记录子") @RestController @@ -109,4 +107,18 @@ public class ProductdismantleRecordDetailaController { ExcelUtils.write(response, "制品拆解记录子.xls", "数据", ProductdismantleRecordDetailaExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detaila:query')") + public CommonResult> getProductdismantleRecordDetailaSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRecordDetailaService.getProductdismantleRecordDetailaSenior(conditions); + PageResult result = ProductdismantleRecordDetailaConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRecordDetailaRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java index 5cc436fa..8763d435 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleRequest; +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.productdismantleRequest.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.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; +import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailaService; 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.productdismantleRequest.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; -import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailaService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解申请子") @RestController @@ -109,4 +107,18 @@ public class ProductdismantleRequestDetailaController { ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailaExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-detaila:query')") + public CommonResult> getProductdismantleRequestDetailaSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRequestDetailaService.getProductdismantleRequestDetailaSenior(conditions); + PageResult result = ProductdismantleRequestDetailaConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRequestDetailaRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java index 4bf7cfe0..c02d200a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.productdismantleRequest; 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; @@ -106,4 +107,19 @@ public class ProductdismantleRequestDetailbController { ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailbExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解申请子分页") + @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')") + public CommonResult> getProductdismantleRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRequestDetailbService.getProductdismantleRequestDetailbSenior(conditions); + PageResult result = ProductdismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRequestDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java index 1530c948..5a87f3ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleRequest; +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.productdismantleRequest.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.convert.productdismantleRequest.ProductdismantleRequestMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; +import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestMainService; 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.productdismantleRequest.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; -import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解申请主") @RestController @@ -109,4 +107,18 @@ public class ProductdismantleRequestMainController { ExcelUtils.write(response, "制品拆解申请主.xls", "数据", ProductdismantleRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-main:query')") + public CommonResult> getProductdismantleRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRequestMainService.getProductdismantleRequestMainSenior(conditions); + PageResult result = ProductdismantleRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java index 1dcfa47b..c3501444 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.production; +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.production.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.convert.production.ProductionDetailConvert; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.service.production.ProductionDetailService; 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.production.vo.*; -import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.module.wms.convert.production.ProductionDetailConvert; -import com.win.module.wms.service.production.ProductionDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产计划子") @RestController @@ -109,4 +107,18 @@ public class ProductionDetailController { ExcelUtils.write(response, "生产计划子.xls", "数据", ProductionDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产计划子分页") + @PreAuthorize("@ss.hasPermission('wms:production-detail:query')") + public CommonResult> getProductionDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionDetailService.getProductionDetailSenior(conditions); + PageResult result = ProductionDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java index 9d72d587..7a62d6ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.production; +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.production.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.convert.production.ProductionMainConvert; +import com.win.module.wms.dal.dataobject.production.ProductionMainDO; +import com.win.module.wms.service.production.ProductionMainService; 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.production.vo.*; -import com.win.module.wms.dal.dataobject.production.ProductionMainDO; -import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.service.production.ProductionMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产计划主") @RestController @@ -109,4 +107,18 @@ public class ProductionMainController { ExcelUtils.write(response, "生产计划主.xls", "数据", ProductionMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产计划主分页") + @PreAuthorize("@ss.hasPermission('wms:production-main:query')") + public CommonResult> getProductionMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionMainService.getProductionMainSenior(conditions); + PageResult result = ProductionMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java index ff676f83..3b13305b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.productionline; 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.productionline.vo.ProductionlineImportExcelVO; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.convert.productionline.ProductionlineConvert; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; @@ -145,4 +145,18 @@ public class ProductionlineController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产线分页") + @PreAuthorize("@ss.hasPermission('wms:productionline:query')") + public CommonResult> getProductionlineSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionlineService.getProductionlineSenior(conditions); + PageResult result = ProductionlineConvert.INSTANCE.convertPage(pageResult); + for(ProductionlineRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java index 7de06016..d081e576 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.productionlineitem; 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.productionlineitem.vo.ProductionlineItemImportExcelVO; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; @@ -144,4 +144,18 @@ public class ProductionlineitemController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产线物料关系分页") + @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')") + public CommonResult> getProductionlineitemSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionlineitemService.getProductionlineitemSenior(conditions); + PageResult result = ProductionlineitemConvert.INSTANCE.convertPage(pageResult); + for(ProductionlineitemRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java index ccb2145d..ed01463f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptJob; +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.productionreceiptJob.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.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; +import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService; 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.productionreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; -import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料任务子") @RestController @@ -110,4 +108,18 @@ public class ProductionreceiptJobDetailController { ExcelUtils.write(response, "生产收料任务子.xls", "数据", ProductionreceiptJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-detail:query')") + public CommonResult> getProductionreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptJobDetailService.getProductionreceiptJobDetailSenior(conditions); + PageResult result = ProductionreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java index c0454fe3..ce9434fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptJob; +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.productionreceiptJob.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.convert.productionreceiptJob.ProductionreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; 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.productionreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; -import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料任务主") @RestController @@ -108,4 +106,18 @@ public class ProductionreceiptJobMainController { ExcelUtils.write(response, "生产收料任务主.xls", "数据", ProductionreceiptJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')") + public CommonResult> getProductionreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptJobMainService.getProductionreceiptJobMainSenior(conditions); + PageResult result = ProductionreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java index 5ddeef1f..215b154b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptRecord; +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.productionreceiptRecord.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.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; +import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordDetailService; 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.productionreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; -import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料记录子") @RestController @@ -108,4 +106,18 @@ public class ProductionreceiptRecordDetailController { ExcelUtils.write(response, "生产收料记录子.xls", "数据", ProductionreceiptRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-detail:query')") + public CommonResult> getProductionreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptRecordDetailService.getProductionreceiptRecordDetailSenior(conditions); + PageResult result = ProductionreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java index cb8bc188..d6c681be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptRecord; +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.productionreceiptRecord.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.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; +import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordMainService; 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.productionreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; -import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料记录主") @RestController @@ -109,4 +107,18 @@ public class ProductionreceiptRecordMainController { ExcelUtils.write(response, "生产收料记录主.xls", "数据", ProductionreceiptRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-main:query')") + public CommonResult> getProductionreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptRecordMainService.getProductionreceiptRecordMainSenior(conditions); + PageResult result = ProductionreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java index ecf36ca8..858e7140 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnJob; +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.productionreturnJob.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.convert.productionreturnJob.ProductionreturnJobDetailConvert; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; +import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService; 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.productionreturnJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; -import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料任务子") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnJobDetailController { ExcelUtils.write(response, "生产退料任务子.xls", "数据", ProductionreturnJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-detail:query')") + public CommonResult> getProductionreturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnJobDetailService.getProductionreturnJobDetailSenior(conditions); + PageResult result = ProductionreturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java index edd5a799..c8018175 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnJob; +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.productionreturnJob.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.convert.productionreturnJob.ProductionreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; 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.productionreturnJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; -import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料任务主") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnJobMainController { ExcelUtils.write(response, "生产退料任务主.xls", "数据", ProductionreturnJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')") + public CommonResult> getProductionreturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnJobMainService.getProductionreturnJobMainSenior(conditions); + PageResult result = ProductionreturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java index e98013ab..49ffb425 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRecord; +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.productionreturnRecord.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.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; +import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordDetailService; 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.productionreturnRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; -import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料记录子") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnRecordDetailController { ExcelUtils.write(response, "生产退料记录子.xls", "数据", ProductionreturnRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-detail:query')") + public CommonResult> getProductionreturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRecordDetailService.getProductionreturnRecordDetailSenior(conditions); + PageResult result = ProductionreturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java index d53902e2..80ebf72e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRecord; +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.productionreturnRecord.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.convert.productionreturnRecord.ProductionreturnRecordMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; +import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordMainService; 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.productionreturnRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; -import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料记录主") @RestController @@ -109,4 +107,19 @@ public class ProductionreturnRecordMainController { ExcelUtils.write(response, "生产退料记录主.xls", "数据", ProductionreturnRecordMainExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-main:query')") + public CommonResult> getProductionreturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRecordMainService.getProductionreturnRecordMainSenior(conditions); + PageResult result = ProductionreturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java index af78e8b6..bb0a13a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRequest; +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.productionreturnRequest.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.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; +import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService; 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.productionreturnRequest.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; -import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料申请子") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnRequestDetailController { ExcelUtils.write(response, "生产退料申请子.xls", "数据", ProductionreturnRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-detail:query')") + public CommonResult> getProductionreturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRequestDetailService.getProductionreturnRequestDetailSenior(conditions); + PageResult result = ProductionreturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java index 519e2fbd..fc2d0bd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRequest; +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.productionreturnRequest.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.convert.productionreturnRequest.ProductionreturnRequestMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; +import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService; 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.productionreturnRequest.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; -import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料申请主") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnRequestMainController { ExcelUtils.write(response, "生产退料申请主.xls", "数据", ProductionreturnRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:query')") + public CommonResult> getProductionreturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRequestMainService.getProductionreturnRequestMainSenior(conditions); + PageResult result = ProductionreturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java index 7a9de4cd..acad8d88 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayJob; +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.productputawayJob.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.convert.productputawayJob.ProductputawayJobDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; +import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService; 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.productputawayJob.vo.*; -import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; -import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; -import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架任务子") @RestController @@ -108,4 +106,18 @@ public class ProductputawayJobDetailController { ExcelUtils.write(response, "制品上架任务子.xls", "数据", ProductputawayJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-job-detail:query')") + public CommonResult> getProductputawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayJobDetailService.getProductputawayJobDetailSeniorList(conditions); + PageResult result = ProductputawayJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java index 9f18df24..d24b8dba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayJob; +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.productputawayJob.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.convert.productputawayJob.ProductputawayJobMainConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService; 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.productputawayJob.vo.*; -import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; -import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; -import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架任务主") @RestController @@ -109,4 +107,18 @@ public class ProductputawayJobMainController { ExcelUtils.write(response, "制品上架任务主.xls", "数据", ProductputawayJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-job-main:query')") + public CommonResult> getProductputawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayJobMainService.getProductputawayJobMainSenior(conditions); + PageResult result = ProductputawayJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java index a2206c96..ec4e1050 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRecord; +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.productputawayRecord.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.convert.productputawayRecord.ProductputawayRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; +import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService; 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.productputawayRecord.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; -import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架记录子") @RestController @@ -109,4 +107,18 @@ public class ProductputawayRecordDetailController { ExcelUtils.write(response, "制品上架记录子.xls", "数据", ProductputawayRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-record-detail:query')") + public CommonResult> getProductputawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRecordDetailService.getProductputawayRecordDetailSenior(conditions); + PageResult result = ProductputawayRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java index 9294da5b..d8b3a2fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRecord; +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.productputawayRecord.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.convert.productputawayRecord.ProductputawayRecordMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; +import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService; 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.productputawayRecord.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; -import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架记录主") @RestController @@ -109,4 +107,18 @@ public class ProductputawayRecordMainController { ExcelUtils.write(response, "制品上架记录主.xls", "数据", ProductputawayRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:query')") + public CommonResult> getProductputawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRecordMainService.getProductputawayRecordMainSenior(conditions); + PageResult result = ProductputawayRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java index ea5e989a..24951430 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRequest; +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.productputawayRequest.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.convert.productputawayRequest.ProductputawayRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; +import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService; 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.productputawayRequest.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; -import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架申请子") @RestController @@ -109,4 +107,18 @@ public class ProductputawayRequestDetailController { ExcelUtils.write(response, "制品上架申请子.xls", "数据", ProductputawayRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-request-detail:query')") + public CommonResult> getProductputawayRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRequestDetailService.getProductputawayRequestDetailSenior(conditions); + PageResult result = ProductputawayRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java index 21ffd7dc..ffadb35f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRequest; +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.productputawayRequest.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.convert.productputawayRequest.ProductputawayRequestMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; +import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService; 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.productputawayRequest.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; -import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架申请主") @RestController @@ -108,5 +106,19 @@ public class ProductputawayRequestMainController { } ExcelUtils.write(response, "制品上架申请主.xls", "数据", ProductputawayRequestMainExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-request-main:query')") + public CommonResult> getProductputawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRequestMainService.getProductputawayRequestMainSenior(conditions); + PageResult result = ProductputawayRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java index 788532f1..ec4f8bce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java @@ -1,33 +1,32 @@ package com.win.module.wms.controller.productreceiptJob; +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.productreceiptJob.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.convert.productreceiptJob.ProductreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; +import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService; 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.productreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; -import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货任务子") @RestController @@ -103,4 +102,18 @@ public class ProductreceiptJobDetailController { ExcelUtils.write(response, "制品收货任务子.xls", "数据", ProductreceiptJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-detail:query')") + public CommonResult> getProductreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptJobDetailService.getProductreceiptJobDetailSenior(conditions); + PageResult result = ProductreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java index 6abd3332..31ecfd03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptJob; +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.accountcalendar.vo.ProductreceiptJobMainRespVO; import com.win.module.wms.controller.productreceiptJob.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.convert.accountcalendar.ProductreceiptJobMainConvert; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptJobMainDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; 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.productreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; -import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货任务主") @RestController @@ -109,4 +110,19 @@ public class ProductreceiptJobMainController { ExcelUtils.write(response, "制品收货任务主.xls", "数据", ProductreceiptJobMainExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-main:query')") + public CommonResult> getProductreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptJobMainService.getProductreceiptJobMainSenior(conditions); + PageResult result = ProductreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java index ec5c5a06..a4e81f0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java @@ -1,13 +1,17 @@ package com.win.module.wms.controller.productreceiptRecord; 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.accountcalendar.vo.BackflushRecordDetailbRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; +import com.win.module.wms.convert.accountcalendar.BackflushRecordDetailbConvert; import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.BackflushRecordDetailbDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import com.win.module.wms.service.productreceiptRecord.BackflushRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; @@ -105,4 +109,19 @@ public class BackflushRecordDetailbController { ExcelUtils.write(response, "制品收货记录子.xls", "数据", BackflushRecordDetailbExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货记录子分页") + @PreAuthorize("@ss.hasPermission('wms:backflush-record-detailb:query')") + public CommonResult> getBackflushRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = backflushRecordDetailbService.getBackflushRecordDetailbSenior(conditions); + PageResult result = BackflushRecordDetailbConvert.INSTANCE.convertPage(pageResult); + for(BackflushRecordDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java index 06aad426..2336f159 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptRecord; +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.accountcalendar.vo.ProductreceiptRecordDetailRespVO; import com.win.module.wms.controller.productreceiptRecord.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.convert.accountcalendar.ProductreceiptRecordDetailConvert; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; +import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService; 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.productreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; -import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货记录子") @RestController @@ -109,4 +110,18 @@ public class ProductreceiptRecordDetailController { ExcelUtils.write(response, "制品收货记录子.xls", "数据", ProductreceiptRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-detail:query')") + public CommonResult> getProductreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRecordDetailService.getProductreceiptRecordDetailSenior(conditions); + PageResult result = ProductreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java index 9779f29d..ae9198d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptRecord; +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.accountcalendar.vo.ProductreceiptRecordMainRespVO; import com.win.module.wms.controller.productreceiptRecord.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.convert.accountcalendar.ProductreceiptRecordMainConvert; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordMainDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; +import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService; 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.productreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; -import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货记录主") @RestController @@ -109,4 +110,18 @@ public class ProductreceiptRecordMainController { ExcelUtils.write(response, "制品收货记录主.xls", "数据", ProductreceiptRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-main:query')") + public CommonResult> getProductreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRecordMainService.getProductreceiptRecordMainSenior(conditions); + PageResult result = ProductreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java index 09a2092b..52b4b01e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptRequest; +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.accountcalendar.vo.ProductreceiptRequestDetailRespVO; import com.win.module.wms.controller.productreceiptRequest.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.convert.accountcalendar.ProductreceiptRequestDetailConvert; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; +import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService; 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.productreceiptRequest.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; -import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货申请子") @RestController @@ -109,4 +110,17 @@ public class ProductreceiptRequestDetailController { ExcelUtils.write(response, "制品收货申请子.xls", "数据", ProductreceiptRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-detail:query')") + public CommonResult> getProductreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRequestDetailService.getProductreceiptRequestDetailSenior(conditions); + PageResult result = ProductreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java index b2dd4753..a7a93dec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java @@ -1,33 +1,35 @@ package com.win.module.wms.controller.productreceiptRequest; +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.accountcalendar.vo.ProductreceiptRequestMainRespVO; import com.win.module.wms.controller.productreceiptRequest.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.convert.accountcalendar.ProductreceiptRequestMainConvert; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestMainDO; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; +import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService; 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.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; -import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货申请主") @RestController @@ -108,4 +110,18 @@ public class ProductreceiptRequestMainController { ExcelUtils.write(response, "制品收货申请主.xls", "数据", ProductreceiptRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-main:query')") + public CommonResult> getProductreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRequestMainService.getProductreceiptRequestMainSenior(conditions); + PageResult result = ProductreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java index fe5a78a0..da15c2fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.productrepairRecord; 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; @@ -106,4 +107,17 @@ public class ConsumeRecordDetailbController { ExcelUtils.write(response, "制品返修记录子.xls", "数据", ConsumeRecordDetailbExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修记录子分页") + @PreAuthorize("@ss.hasPermission('wms:consume-record-detailb:query')") + public CommonResult> getConsumeRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = consumeRecordDetailbService.getConsumeRecordDetailbSenior(conditions); + PageResult result = ConsumeRecordDetailbConvert.INSTANCE.convertPage(pageResult); + for(ConsumeRecordDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java index dac7f27a..04879ca3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productrepairRecord; +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.accountcalendar.vo.ProductrepairRecordDetailRespVO; import com.win.module.wms.controller.productrepairRecord.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.convert.accountcalendar.ProductrepairRecordDetailConvert; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRecordDetailDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; +import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService; 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.productrepairRecord.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; -import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修记录子") @RestController @@ -110,4 +111,18 @@ public class ProductrepairRecordDetailController { ExcelUtils.write(response, "制品返修记录子.xls", "数据", ProductrepairRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productrepair-record-detail:query')") + public CommonResult> getProductrepairRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRecordDetailService.getProductrepairRecordDetailSenior(conditions); + PageResult result = ProductrepairRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java index 26c8380e..aef2e613 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productrepairRecord; +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.productrepairRecord.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.convert.productrepairRecord.ProductrepairRecordMainConvert; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; +import com.win.module.wms.service.productrepairRecord.ProductrepairRecordMainService; 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.productrepairRecord.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; -import com.win.module.wms.service.productrepairRecord.ProductrepairRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修记录主") @RestController @@ -107,5 +105,18 @@ public class ProductrepairRecordMainController { } ExcelUtils.write(response, "制品返修记录主.xls", "数据", ProductrepairRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productrepair-record-main:query')") + public CommonResult> getProductrepairRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRecordMainService.getProductrepairRecordMainSenior(conditions); + PageResult result = ProductrepairRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java index a9442636..1d671704 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productrepairRequest; +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.productrepairRequest.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.convert.productrepairRequest.ProductrepairRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; +import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailaService; 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.productrepairRequest.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; -import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailaService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修申请子") @RestController @@ -109,4 +107,18 @@ public class ProductrepairRequestDetailaController { ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailaExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getProductrepairRequestDetailaSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestDetailaService.getProductrepairRequestDetailaSenior(conditions); + PageResult result = ProductrepairRequestDetailaConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestDetailaRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java index 8f79bc0c..75d66e29 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java @@ -119,4 +119,18 @@ public class ProductrepairRequestDetailbController { ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修申请子分页") + @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") + public CommonResult> getProductrepairRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestDetailbService.getProductrepairRequestDetailbSenior(conditions); + PageResult result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java index c78bdf38..8f4d1461 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productrepairRequest; +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.accountcalendar.vo.ProductrepairRequestMainRespVO; import com.win.module.wms.controller.productrepairRequest.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.convert.accountcalendar.ProductrepairRequestMainConvert; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRequestMainDO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; +import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService; 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.productrepairRequest.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; -import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修申请主") @RestController @@ -109,4 +110,18 @@ public class ProductrepairRequestMainController { ExcelUtils.write(response, "制品返修申请主.xls", "数据", ProductrepairRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productrepair-request-main:query')") + public CommonResult> getProductrepairRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestMainService.getProductrepairRequestMainSenior(conditions); + PageResult result = ProductrepairRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java index 6f465cbb..ee232b30 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.packageMassage; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 包装 Mapper * @@ -64,6 +66,10 @@ public interface PackageMapper extends BaseMapperX { .orderByDesc(PackageDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PackageExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PackageDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java index 6574c689..987df32c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.paramsetting; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.paramsetting.vo.ParamsettingExportReqVO; import com.win.module.wms.controller.paramsetting.vo.ParamsettingPageReqVO; import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 参数设置 Mapper * @@ -32,6 +34,10 @@ public interface ParamsettingMapper extends BaseMapperX { .orderByDesc(ParamsettingDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ParamsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ParamsettingDO::getStrategyType, reqVO.getStrategyType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java index 629d05ea..b0ae72e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料任务子 Mapper * @@ -42,6 +44,10 @@ public interface PickJobDetailMapper extends BaseMapperX { .orderByDesc(PickJobDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java index f94db3eb..3f1be3c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料任务主 Mapper * @@ -59,6 +61,10 @@ public interface PickJobMainMapper extends BaseMapperX { .orderByDesc(PickJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java index af90506a..62c0bcf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料记录子 Mapper * @@ -51,6 +53,9 @@ public interface PickRecordDetailMapper extends BaseMapperX .eqIfPresent(PickRecordDetailDO::getToBatch, reqVO.getToBatch()) .orderByDesc(PickRecordDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PickRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java index 72da154d..e264a22d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料记录主 Mapper * @@ -46,6 +48,10 @@ public interface PickRecordMainMapper extends BaseMapperX { .orderByDesc(PickRecordMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java index 0c9f00e3..5d6f73e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.pickRequest; 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.pickRequest.vo.PickRequestDetailExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -39,6 +42,9 @@ public interface PickRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PickRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java index a149abf9..3f9b3b2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.pickRequest; 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.pickRequest.vo.PickRequestMainExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; import org.apache.ibatis.annotations.Mapper; @@ -44,6 +47,10 @@ public interface PickRequestMainMapper extends BaseMapperX { .orderByDesc(PickRequestMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java index 08784a16..c57c7f06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.preparetoissue; 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.preparetoissue.vo.PreparetoissueDetailExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; @@ -36,6 +38,10 @@ public interface PreparetoissueDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PreparetoissueDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PreparetoissueDetailDO::getToLocationCode, reqVO.getToLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java index 3638c99a..185b3b63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.preparetoissue; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 备料计划主 Mapper * @@ -40,6 +42,10 @@ public interface PreparetoissueMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PreparetoissueMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PreparetoissueMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java index 871a562f..8d463244 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java @@ -1,10 +1,13 @@ package com.win.module.wms.dal.mysql.process; +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.process.vo.ProcessExportReqVO; import com.win.module.wms.controller.process.vo.ProcessPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import org.apache.ibatis.annotations.Mapper; @@ -35,6 +38,10 @@ public interface ProcessMapper extends BaseMapperX { .orderByDesc(ProcessDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProcessExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProcessDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java index bac05f66..fe32a00d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解任务子 Mapper * @@ -48,6 +50,10 @@ public interface ProductdismantleJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java index 4af42c67..43c73450 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解任务主 Mapper * @@ -60,6 +62,10 @@ public interface ProductdismantleJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java index 35558007..d5dbfe36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解记录子 Mapper * @@ -50,6 +52,10 @@ public interface ProductdismantleRecordDetailaMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRecordDetailaExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRecordDetailaDO::getFromOwnerCode, reqVO.getFromOwnerCode()) 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 index 2a13430a..2796556f 100644 --- 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 @@ -48,6 +48,7 @@ public interface ProductdismantleRecordDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + default List selectList(ProductdismantleRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java index e48e0f22..28706f5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解申请子 Mapper * @@ -49,6 +51,10 @@ public interface ProductdismantleRequestDetailaMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRequestDetailaExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRequestDetailaDO::getProductionLineCode, reqVO.getProductionLineCode()) 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 index d2c55952..5c9664f6 100644 --- 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 @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productdismantleRequest; +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.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; @@ -39,6 +41,10 @@ public interface ProductdismantleRequestDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRequestDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java index 92bdc9e9..108157e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解申请主 Mapper * @@ -44,6 +46,10 @@ public interface ProductdismantleRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java index ebbd8983..2feabc8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.production; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产计划子 Mapper * @@ -36,6 +38,10 @@ public interface ProductionDetailMapper extends BaseMapperX .orderByDesc(ProductionDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java index 4b908faa..f4f5006a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java @@ -1,16 +1,17 @@ package com.win.module.wms.dal.mysql.production; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; -import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产计划主 Mapper * @@ -43,6 +44,10 @@ public interface ProductionMainMapper extends BaseMapperX { .orderByDesc(ProductionMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionMainDO::getDisplayOrder, reqVO.getDisplayOrder()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java index 0a6850d8..056c1faa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productionline; +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.productionline.vo.ProductionlineExportReqVO; import com.win.module.wms.controller.productionline.vo.ProductionlinePageReqVO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; @@ -36,6 +38,10 @@ public interface ProductionlineMapper extends BaseMapperX { .orderByDesc(ProductionlineDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionlineExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionlineDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java index 25ac668f..ffd0da42 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionlineitem; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemExportReqVO; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemPageReqVO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产线物料关系 Mapper * @@ -31,7 +33,9 @@ public interface ProductionlineitemMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductionlineitemExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java index dd555537..73f44945 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料任务子 Mapper * @@ -45,6 +47,10 @@ public interface ProductionreceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java index 964d0196..15c1d0da 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料任务主 Mapper * @@ -61,6 +63,10 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptJobMainDO::getIssueJobNumber, reqVO.getIssueJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java index 2258a5cc..878d2258 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料记录子 Mapper * @@ -55,6 +57,10 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java index 073dd067..3e0111a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料记录主 Mapper * @@ -48,6 +50,10 @@ public interface ProductionreceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptRecordMainDO::getIssueJobNumber, reqVO.getIssueJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java index 4468e41a..4d7ca792 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料任务子 Mapper * @@ -44,6 +46,10 @@ public interface ProductionreturnJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java index 17ed56f7..43376371 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料任务主 Mapper * @@ -61,6 +63,10 @@ public interface ProductionreturnJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java index 21e3b6e5..d9416779 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料记录子 Mapper * @@ -54,6 +56,9 @@ public interface ProductionreturnRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductionreturnRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java index 7e4deddb..10c6d14b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料记录主 Mapper * @@ -47,6 +49,10 @@ public interface ProductionreturnRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java index dcf94fd6..d4fba8f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料申请子 Mapper * @@ -45,6 +47,10 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java index 411f4066..3dcdfeb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料申请主 Mapper * @@ -44,7 +46,9 @@ public interface ProductionreturnRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductionreturnRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java index d44094f1..3976cfa1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架任务子 Mapper * @@ -44,6 +46,10 @@ public interface ProductputawayJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java index a58fcfe0..6f26c12c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架任务主 Mapper * @@ -60,6 +62,10 @@ public interface ProductputawayJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java index ebf7f650..e798e045 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架记录子 Mapper * @@ -54,6 +56,10 @@ public interface ProductputawayRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java index 42e1232b..8b49cacc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架记录主 Mapper * @@ -48,6 +50,10 @@ public interface ProductputawayRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java index 7ed2aa8c..754ae1f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架申请子 Mapper * @@ -45,6 +47,10 @@ public interface ProductputawayRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java index a82abcc9..a3f23fd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架申请主 Mapper * @@ -45,6 +47,10 @@ public interface ProductputawayRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRequestMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java index 821bfb06..c2e74143 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货任务子 Mapper * @@ -49,6 +51,10 @@ public interface ProductreceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java index 12febfd2..254d3229 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货任务主 Mapper * @@ -62,6 +64,10 @@ public interface ProductreceiptJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java index 73105a41..8b2b5d34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productreceiptRecord; +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.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; @@ -44,6 +46,10 @@ public interface BackflushRecordDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(BackflushRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BackflushRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java index 5a42487f..1ff8e134 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货记录子 Mapper * @@ -54,6 +56,10 @@ public interface ProductreceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRecordDetailDO::getProductionlineCode, reqVO.getProductionlineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java index 3e1c138d..a1403226 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货记录主 Mapper * @@ -47,6 +49,10 @@ public interface ProductreceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java index 64d2c1d0..61348d2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货申请子 Mapper * @@ -50,6 +52,10 @@ public interface ProductreceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java index d29fcc69..c376cbd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货申请主 Mapper * @@ -45,6 +47,10 @@ public interface ProductreceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRequestMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java index fc16adb1..e51c9f31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productrepairRecord; +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.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; @@ -41,6 +43,10 @@ public interface ConsumeRecordDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ConsumeRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConsumeRecordDetailbDO::getBatch, reqVO.getBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java index 6381fba1..2060becc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修记录子 Mapper * @@ -50,6 +52,10 @@ public interface ProductrepairRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductrepairRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java index bb72dd60..31d9c8d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修记录主 Mapper * @@ -45,6 +47,10 @@ public interface ProductrepairRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductrepairRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java index 4f552a04..449bda88 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修申请子 Mapper * @@ -44,6 +46,9 @@ public interface ProductrepairRequestDetailaMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductrepairRequestDetailaExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java index 592b4276..e03f5007 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修申请主 Mapper * @@ -44,6 +46,10 @@ public interface ProductrepairRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductrepairRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java index 7613546a..ef6ef7de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java @@ -77,5 +77,6 @@ public interface AccountcalendarService { */ List getAccountcalendarList(AccountcalendarExportReqVO exportReqVO); + List importAccountcalendarList(List accountcalendarImportExcelVos, Integer mode, boolean updatePart); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java index d3099f77..3d63d290 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.packageMassage; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 包装 Service 接口 @@ -77,4 +79,12 @@ public interface PackageService { * @return 包装列表 */ PackageDO LabelExist(String pnumber); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPackageSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 06408550..dc506a1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -1,24 +1,25 @@ package com.win.module.wms.service.packageMassage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; +import com.win.module.wms.convert.packageMassage.PackageConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; +import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; 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.packageMassage.PackageDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.packageMassage.PackageConvert; -import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; +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.PACKAGE_NOT_EXISTS; /** * 包装 Service 实现类 @@ -96,4 +97,9 @@ public class PackageServiceImpl implements PackageService { throw exception(PACKAGE_NOT_EXISTS); } } + + @Override + public PageResult getPackageSenior(CustomConditions conditions) { + return packageMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java index 35a73e56..3e3d04b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.paramsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.paramsetting.vo.*; import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO; @@ -70,4 +71,12 @@ public interface ParamsettingService { List getParamsettingList(ParamsettingExportReqVO exportReqVO); List importParamsettingList(List paramsettings, Integer mode, Boolean updatePart); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getParamsettingSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java index aade11e5..133060f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.paramsetting; import cn.hutool.core.collection.CollUtil; 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.paramsetting.vo.*; @@ -172,4 +173,9 @@ public class ParamsettingServiceImpl implements ParamsettingService { throw exception(PARAMSETTING_VALUE_SCOPE_NOT_EXISTS); } } + @Override + public PageResult getParamsettingSenior(CustomConditions conditions) { + return paramsettingMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java index a716f07a..3d926cf7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.pickJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobDetailCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料任务子 Service 接口 @@ -71,4 +73,11 @@ public interface PickJobDetailService { */ List getPickJobDetailList(PickJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickJobDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java index 0e8d9206..0f332381 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.pickJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobDetailCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailUpdateReqVO; +import com.win.module.wms.convert.pickJob.PickJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; +import com.win.module.wms.dal.mysql.pickJob.PickJobDetailMapper; 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.pickJob.PickJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickJob.PickJobDetailConvert; -import com.win.module.wms.dal.mysql.pickJob.PickJobDetailMapper; +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.PICK_JOB_DETAIL_NOT_EXISTS; /** * 拣料任务子 Service 实现类 @@ -83,4 +84,8 @@ public class PickJobDetailServiceImpl implements PickJobDetailService { return pickJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getPickJobDetailSenior(CustomConditions conditions) { + return pickJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index dbde6ac1..49b7c471 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.pickJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobMainCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料任务主 Service 接口 @@ -78,4 +80,12 @@ public interface PickJobMainService { * @return 采购订单主列表 */ public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 1950a3ab..77d50961 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -1,25 +1,25 @@ package com.win.module.wms.service.pickJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobMainCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; +import com.win.module.wms.convert.pickJob.PickJobMainConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import com.win.module.wms.dal.mysql.pickJob.PickJobMainMapper; 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.pickJob.PickJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickJob.PickJobMainConvert; -import com.win.module.wms.dal.mysql.pickJob.PickJobMainMapper; +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.PICK_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PICK_JOB_MAIN_STATUS_ERROR; /** * 拣料任务主 Service 实现类 @@ -96,4 +96,9 @@ public class PickJobMainServiceImpl implements PickJobMainService { throw exception(PICK_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getPickJobMainSenior(CustomConditions conditions) { + return pickJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java index f47b7bc2..43561ea9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java @@ -1,14 +1,17 @@ package com.win.module.wms.service.pickRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料记录子 Service 接口 @@ -71,4 +74,11 @@ public interface PickRecordDetailService { */ List getPickRecordDetailList(PickRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java index c35e2c16..ddbec7c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.pickRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailUpdateReqVO; +import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; +import com.win.module.wms.dal.mysql.pickRecord.PickRecordDetailMapper; 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.pickRecord.PickRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; -import com.win.module.wms.dal.mysql.pickRecord.PickRecordDetailMapper; +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.PICK_RECORD_DETAIL_NOT_EXISTS; /** * 拣料记录子 Service 实现类 @@ -83,4 +83,8 @@ public class PickRecordDetailServiceImpl implements PickRecordDetailService { return pickRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getPickRecordDetailSenior(CustomConditions conditions) { + return pickRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java index ac30ab3a..9757f788 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.pickRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料记录主 Service 接口 @@ -71,4 +73,11 @@ public interface PickRecordMainService { */ List getPickRecordMainList(PickRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java index 9354407f..3655cb27 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.pickRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainUpdateReqVO; +import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; +import com.win.module.wms.dal.mysql.pickRecord.PickRecordMainMapper; 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.pickRecord.PickRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; -import com.win.module.wms.dal.mysql.pickRecord.PickRecordMainMapper; +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.PICK_RECORD_MAIN_NOT_EXISTS; /** * 拣料记录主 Service 实现类 @@ -83,4 +84,8 @@ public class PickRecordMainServiceImpl implements PickRecordMainService { return pickRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getPickRecordMainSenior(CustomConditions conditions) { + return pickRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java index cd6c4698..23e90e1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.pickRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; import com.win.framework.common.pojo.PageResult; @@ -63,6 +65,14 @@ public interface PickRequestDetailService { */ PageResult getPickRequestDetailPage(PickRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRequestDetailSenior(CustomConditions conditions); + /** * 获得拣料申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java index 28e2d7fd..725b3b45 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.pickRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -77,6 +79,10 @@ public class PickRequestDetailServiceImpl implements PickRequestDetailService { public PageResult getPickRequestDetailPage(PickRequestDetailPageReqVO pageReqVO) { return pickRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getPickRequestDetailSenior(CustomConditions conditions) { + return pickRequestDetailMapper.selectSenior(conditions); + } @Override public List getPickRequestDetailList(PickRequestDetailExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java index cb6d102d..7e8dbc35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.pickRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; import com.win.framework.common.pojo.PageResult; @@ -54,6 +56,13 @@ public interface PickRequestMainService { * @return 拣料申请主列表 */ List getPickRequestMainList(Collection ids); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRequestMainSenior(CustomConditions conditions); /** * 获得拣料申请主分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java index 65447cc1..2b9b7808 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.pickRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -73,6 +75,10 @@ public class PickRequestMainServiceImpl implements PickRequestMainService { return pickRequestMainMapper.selectBatchIds(ids); } + @Override + public PageResult getPickRequestMainSenior(CustomConditions conditions) { + return pickRequestMainMapper.selectSenior(conditions); + } @Override public PageResult getPickRequestMainPage(PickRequestMainPageReqVO pageReqVO) { return pickRequestMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java index 85d37b9c..ee3d3b1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.preparetoissue; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 备料计划子 Service 接口 @@ -71,4 +73,13 @@ public interface PreparetoissueDetailService { */ List getPreparetoissueDetailList(PreparetoissueDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPreparetoissueDetailSenior(CustomConditions conditions); + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java index 2df12140..b50b7d7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.preparetoissue; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailUpdateReqVO; +import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; +import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueDetailMapper; 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.preparetoissue.PreparetoissueDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; -import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueDetailMapper; +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.PREPARETOISSUE_DETAIL_NOT_EXISTS; /** * 备料计划子 Service 实现类 @@ -83,4 +83,9 @@ public class PreparetoissueDetailServiceImpl implements PreparetoissueDetailServ return preparetoissueDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getPreparetoissueDetailSenior(CustomConditions conditions) { + return preparetoissueDetailMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java index 9cfb7cf9..ef743889 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.preparetoissue; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainUpdateReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 备料计划主 Service 接口 @@ -63,6 +65,15 @@ public interface PreparetoissueMainService { */ PageResult getPreparetoissueMainPage(PreparetoissueMainPageReqVO pageReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPreparetoissueMainSenior(CustomConditions conditions); + /** * 获得备料计划主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java index 753cd863..3d74539e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.preparetoissue; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainUpdateReqVO; +import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; +import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueMainMapper; 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.preparetoissue.PreparetoissueMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; -import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueMainMapper; +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.PREPARETOISSUE_MAIN_NOT_EXISTS; /** * 备料计划主 Service 实现类 @@ -78,6 +78,11 @@ public class PreparetoissueMainServiceImpl implements PreparetoissueMainService return preparetoissueMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getPreparetoissueMainSenior(CustomConditions conditions) { + return preparetoissueMainMapper.selectSenior(conditions); + } + @Override public List getPreparetoissueMainList(PreparetoissueMainExportReqVO exportReqVO) { return preparetoissueMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java index 2d0ade63..769c5338 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.process; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.process.vo.*; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import javax.validation.Valid; @@ -61,6 +63,14 @@ public interface ProcessService { */ PageResult getProcessPage(ProcessPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProcessSenior(CustomConditions conditions); + /** * 获得工序列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java index 8460a604..8e57b309 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; 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.process.vo.*; import com.win.module.wms.convert.process.ProcessConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import com.win.module.wms.dal.mysql.process.ProcessMapper; @@ -76,6 +78,10 @@ public class ProcessServiceImpl implements ProcessService { public PageResult getProcessPage(ProcessPageReqVO pageReqVO) { return processMapper.selectPage(pageReqVO); } + @Override + public PageResult getProcessSenior(CustomConditions conditions) { + return processMapper.selectSenior(conditions); + } @Override public List getProcessList(ProcessExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java index fc8a98de..96ca9e61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailCreateReqVO; 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.dataobject.productdismantleJob.ProductdismantleJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解任务子 Service 接口 @@ -63,6 +65,14 @@ public interface ProductdismantleJobDetailService { */ PageResult getProductdismantleJobDetailPage(ProductdismantleJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleJobDetailSenior(CustomConditions conditions); + /** * 获得制品拆解任务子列表, 用于 Excel 导出 * 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 14e84846..fedacf61 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 @@ -1,23 +1,23 @@ package com.win.module.wms.service.productdismantleJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailCreateReqVO; 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.convert.productdismantleJob.ProductdismantleJobDetailConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobDetailMapper; 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.productdismantleJob.ProductdismantleJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; +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_JOB_DETAIL_NOT_EXISTS; /** * 制品拆解任务子 Service 实现类 @@ -78,6 +78,11 @@ public class ProductdismantleJobDetailServiceImpl implements ProductdismantleJob return productdismantleJobDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getProductdismantleJobDetailSenior(CustomConditions conditions) { + return productdismantleJobDetailMapper.selectSenior(conditions); + } + @Override public List getProductdismantleJobDetailList(ProductdismantleJobDetailExportReqVO exportReqVO) { return productdismantleJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java index 7a5b5f50..5d24b4ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解任务主 Service 接口 @@ -70,6 +72,13 @@ public interface ProductdismantleJobMainService { * @return 制品拆解任务主列表 */ List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleJobMainSenior(CustomConditions conditions); /** * 校验任务状态正确 *@author chenfang diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java index 286107d7..7a79060a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java @@ -1,25 +1,25 @@ package com.win.module.wms.service.productdismantleJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; +import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobMainMapper; 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.productdismantleJob.ProductdismantleJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; -import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobMainMapper; +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_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_JOB_MAIN_STATUS_ERROR; /** * 制品拆解任务主 Service 实现类 @@ -84,6 +84,12 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa public List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO) { return productdismantleJobMainMapper.selectList(exportReqVO); } + + + @Override + public PageResult getProductdismantleJobMainSenior(CustomConditions conditions) { + return productdismantleJobMainMapper.selectSenior(conditions); + } @Override public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus) { QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java index 47bfcf6a..8f2625b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解记录子 Service 接口 @@ -71,4 +73,13 @@ public interface ProductdismantleRecordDetailaService { */ List getProductdismantleRecordDetailaList(ProductdismantleRecordDetailaExportReqVO exportReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRecordDetailaSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java index c5dca52f..8565aa54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java @@ -1,23 +1,23 @@ 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.ProductdismantleRecordDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaUpdateReqVO; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; +import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailaMapper; 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.productdismantleRecord.ProductdismantleRecordDetailaDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; -import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailaMapper; +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_DETAILA_NOT_EXISTS; /** * 制品拆解记录子 Service 实现类 @@ -82,5 +82,9 @@ public class ProductdismantleRecordDetailaServiceImpl implements Productdismantl public List getProductdismantleRecordDetailaList(ProductdismantleRecordDetailaExportReqVO exportReqVO) { return productdismantleRecordDetailaMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRecordDetailaSenior(CustomConditions conditions) { + return productdismantleRecordDetailaMapper.selectSenior(conditions); + } } 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 index 11d272e9..7952c296 100644 --- 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 @@ -81,5 +81,4 @@ public interface ProductdismantleRecordDetailbService { * @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 index ddd935a7..e794bad4 100644 --- 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 @@ -2,8 +2,12 @@ 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.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.convert.productdismantleRecord.ProductdismantleRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailbMapper; import org.springframework.stereotype.Service; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java index 1288c3b4..e5f458ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解申请子 Service 接口 @@ -71,4 +73,13 @@ public interface ProductdismantleRequestDetailaService { */ List getProductdismantleRequestDetailaList(ProductdismantleRequestDetailaExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRequestDetailaSenior(CustomConditions conditions); + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java index 6dc4e0f6..2363304d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaUpdateReqVO; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; +import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailaMapper; 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.productdismantleRequest.ProductdismantleRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; -import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailaMapper; +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_REQUEST_DETAILA_NOT_EXISTS; /** * 制品拆解申请子 Service 实现类 @@ -83,4 +83,9 @@ public class ProductdismantleRequestDetailaServiceImpl implements Productdismant return productdismantleRequestDetailaMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRequestDetailaSenior(CustomConditions conditions) { + return productdismantleRequestDetailaMapper.selectSenior(conditions); + } + } 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 index fc8eae55..1610209f 100644 --- 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 @@ -1,5 +1,6 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; 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; @@ -72,4 +73,11 @@ public interface ProductdismantleRequestDetailbService { */ List getDismantleRequestDetailbList(ProductdismantleRequestDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRequestDetailbSenior(CustomConditions conditions); } 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 index d2d130e4..8811b440 100644 --- 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 @@ -1,11 +1,13 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; 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.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailbMapper; import org.springframework.stereotype.Service; @@ -82,4 +84,9 @@ public class ProductdismantleRequestDetailbServiceImpl implements Productdismant return productdismantleRequestDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRequestDetailbSenior(CustomConditions conditions) { + return productdismantleRequestDetailbMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java index 60ed3057..89158c52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解申请主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductdismantleRequestMainService { */ List getProductdismantleRequestMainList(ProductdismantleRequestMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRequestMainSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java index 3f2b24c3..8bb61ff4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainUpdateReqVO; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; +import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestMainMapper; 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.productdismantleRequest.ProductdismantleRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; -import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestMainMapper; +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_REQUEST_MAIN_NOT_EXISTS; /** * 制品拆解申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR return productdismantleRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRequestMainSenior(CustomConditions conditions) { + return productdismantleRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java index e78420a2..f73fb216 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.production; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产计划子 Service 接口 @@ -71,4 +73,12 @@ public interface ProductionDetailService { */ List getProductionDetailList(ProductionDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionDetailSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java index 8ca92e3b..dd5a1efe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.production; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; +import com.win.module.wms.convert.production.ProductionDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; 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.production.ProductionDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.production.ProductionDetailConvert; -import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; +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.PRODUCTION_DETAIL_NOT_EXISTS; /** * 生产计划子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionDetailServiceImpl implements ProductionDetailService { return productionDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionDetailSenior(CustomConditions conditions) { + return productionDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java index 8dc6ae8c..66466b16 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java @@ -1,15 +1,17 @@ package com.win.module.wms.service.production; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产计划主 Service 接口 @@ -80,4 +82,11 @@ public interface ProductionMainService { */ ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index 4fec9ce4..c67c9ef4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -1,29 +1,25 @@ package com.win.module.wms.service.production; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; +import com.win.module.wms.convert.production.ProductionMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; -import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; -import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; +import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; +import com.win.module.wms.dal.mysql.production.ProductionMainMapper; import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; 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.production.ProductionMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.dal.mysql.production.ProductionMainMapper; -import org.springframework.web.bind.annotation.GetMapping; +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.*; @@ -121,4 +117,9 @@ public class ProductionMainServiceImpl implements ProductionMainService { throw exception(PRODUCTION_MAIN_NUMBER_NOT_EXISTS); } } + + @Override + public PageResult getProductionMainSenior(CustomConditions conditions) { + return productionMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java index 9034b9cf..b57566b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productionline; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; @@ -88,4 +89,12 @@ public interface ProductionlineService { * @return */ public boolean ifProductionPlaninWorkshop(String pworkshopCode,String productionLineCode); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionlineSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java index 179cfb56..7d24fcb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java @@ -5,10 +5,12 @@ 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.productionline.vo.*; import com.win.module.wms.convert.productionline.ProductionlineConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.mysql.productionline.ProductionlineMapper; @@ -188,4 +190,10 @@ public class ProductionlineServiceImpl implements ProductionlineService { throw exception(PRODUCTIONLINE_AND_WORKSHOP_RELATION_ERROR); } } + + @Override + public PageResult getProductionlineSenior(CustomConditions conditions) { + return productionlineMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index 5bb383d5..a2a3dc3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productionlineitem; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; @@ -79,4 +80,13 @@ public interface ProductionlineitemService { * @return 生产线物料关系 */ public List productionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionlineitemSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index 12dfa06e..b81ee9ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; 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.productionlineitem.vo.*; @@ -182,4 +183,10 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } return productionlineitemDO; } + + @Override + public PageResult getProductionlineitemSenior(CustomConditions conditions) { + return productionlineitemMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java index 6b5652a0..45e30ecd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料任务子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreceiptJobDetailService { */ List getProductionreceiptJobDetailList(ProductionreceiptJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptJobDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java index 4211a0ce..46209c31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreceiptJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailUpdateReqVO; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; +import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobDetailMapper; 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.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; -import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobDetailMapper; +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.PRODUCTIONRECEIPT_JOB_DETAIL_NOT_EXISTS; /** * 生产收料任务子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreceiptJobDetailServiceImpl implements ProductionreceiptJ return productionreceiptJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreceiptJobDetailSenior(CustomConditions conditions) { + return productionreceiptJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index ddceb991..b5235f52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料任务主 Service 接口 @@ -78,4 +80,12 @@ public interface ProductionreceiptJobMainService { * @return 采购订单主列表 */ public ProductionreceiptJobMainDO productionreceiptJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index cab65d6a..f4c1964d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -1,24 +1,24 @@ package com.win.module.wms.service.productionreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobMainMapper; import com.win.module.wms.service.production.ProductionMainService; 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.productionreceiptJob.ProductionreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; -import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobMainMapper; +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.*; @@ -111,4 +111,9 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob throw exception(PRODUCTION_DETAIL_VOID_STATUS_ERROR); } } + + @Override + public PageResult getProductionreceiptJobMainSenior(CustomConditions conditions) { + return productionreceiptJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java index 657c53ee..0ebbcdd3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreceiptRecordDetailService { */ List getProductionreceiptRecordDetailList(ProductionreceiptRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java index 8a3942e1..ef5630e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productionreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; +import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordDetailMapper; 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.productionreceiptRecord.ProductionreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; -import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordDetailMapper; +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.PRODUCTIONRECEIPT_RECORD_DETAIL_NOT_EXISTS; /** * 生产收料记录子 Service 实现类 @@ -83,4 +83,8 @@ public class ProductionreceiptRecordDetailServiceImpl implements Productionrecei return productionreceiptRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreceiptRecordDetailSenior(CustomConditions conditions) { + return productionreceiptRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java index e75859fc..0236c33d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料记录主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductionreceiptRecordMainService { */ List getProductionreceiptRecordMainList(ProductionreceiptRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptRecordMainSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java index 8a5bf8dc..89847339 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productionreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainUpdateReqVO; +import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; +import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordMainMapper; 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.productionreceiptRecord.ProductionreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; -import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordMainMapper; +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.PRODUCTIONRECEIPT_RECORD_MAIN_NOT_EXISTS; /** * 生产收料记录主 Service 实现类 @@ -83,4 +83,8 @@ public class ProductionreceiptRecordMainServiceImpl implements Productionreceipt return productionreceiptRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreceiptRecordMainSenior(CustomConditions conditions) { + return productionreceiptRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java index fe066ff0..53fee4c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料任务子 Service 接口 @@ -71,4 +73,12 @@ public interface ProductionreturnJobDetailService { */ List getProductionreturnJobDetailList(ProductionreturnJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnJobDetailSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java index 55e44df5..9a57161d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailUpdateReqVO; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; +import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobDetailMapper; 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.productionreturnJob.ProductionreturnJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; -import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobDetailMapper; +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.PRODUCTIONRETURN_JOB_DETAIL_NOT_EXISTS; /** * 生产退料任务子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnJobDetailServiceImpl implements ProductionreturnJob return productionreturnJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnJobDetailSenior(CustomConditions conditions) { + return productionreturnJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index 05201e8d..b6c6239a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料任务主 Service 接口 @@ -78,4 +80,12 @@ public interface ProductionreturnJobMainService { * @return 采购订单主列表 */ public ProductionreturnJobMainDO productionreturnJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index 6e10fbd1..71e462e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -1,25 +1,26 @@ package com.win.module.wms.service.productionreturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobMainMapper; 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.productionreturnJob.ProductionreturnJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; -import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobMainMapper; +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.PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_JOB_MAIN_STATUS_ERROR; /** * 生产退料任务主 Service 实现类 @@ -97,4 +98,8 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa } } + @Override + public PageResult getProductionreturnJobMainSenior(CustomConditions conditions) { + return productionreturnJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java index 732a6fea..def50b6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRecordDetailService { */ List getProductionreturnRecordDetailList(ProductionreturnRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java index c56c8d30..e21a12a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; +import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordDetailMapper; 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.productionreturnRecord.ProductionreturnRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; -import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordDetailMapper; +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.PRODUCTIONRETURN_RECORD_DETAIL_NOT_EXISTS; /** * 生产退料记录子 Service 实现类 @@ -78,9 +79,18 @@ public class ProductionreturnRecordDetailServiceImpl implements Productionreturn return productionreturnRecordDetailMapper.selectPage(pageReqVO); } + + + + + @Override public List getProductionreturnRecordDetailList(ProductionreturnRecordDetailExportReqVO exportReqVO) { return productionreturnRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRecordDetailSenior(CustomConditions conditions) { + return productionreturnRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java index 58f64840..be489f87 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRecordMainService { */ List getProductionreturnRecordMainList(ProductionreturnRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java index 7639fdf3..5c404d67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainUpdateReqVO; +import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; +import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordMainMapper; 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.productionreturnRecord.ProductionreturnRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; -import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordMainMapper; +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.PRODUCTIONRETURN_RECORD_MAIN_NOT_EXISTS; /** * 生产退料记录主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe return productionreturnRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRecordMainSenior(CustomConditions conditions) { + return productionreturnRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java index 2e8b16b9..2ec6f4e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRequestDetailService { */ List getProductionreturnRequestDetailList(ProductionreturnRequestDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRequestDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java index 67e25f82..de560561 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailUpdateReqVO; +import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; +import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestDetailMapper; 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.productionreturnRequest.ProductionreturnRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; -import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestDetailMapper; +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.PRODUCTIONRETURN_REQUEST_DETAIL_NOT_EXISTS; /** * 生产退料申请子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnRequestDetailServiceImpl implements Productionretur return productionreturnRequestDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRequestDetailSenior(CustomConditions conditions) { + return productionreturnRequestDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java index 9d2acbf6..835ced58 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料申请主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRequestMainService { */ List getProductionreturnRequestMainList(ProductionreturnRequestMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java index 179899ad..3cfbb134 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainUpdateReqVO; +import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; +import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestMainMapper; 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.productionreturnRequest.ProductionreturnRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; -import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestMainMapper; +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.PRODUCTIONRETURN_REQUEST_MAIN_NOT_EXISTS; /** * 生产退料申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR return productionreturnRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRequestMainSenior(CustomConditions conditions) { + return productionreturnRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java index b7d46d01..96ff0acc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架任务子 Service 接口 @@ -71,4 +73,12 @@ public interface ProductputawayJobDetailService { */ List getProductputawayJobDetailList(ProductputawayJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayJobDetailSeniorList(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java index 9bbb56e6..ab004501 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productputawayJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailUpdateReqVO; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; +import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobDetailMapper; 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.productputawayJob.ProductputawayJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; -import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobDetailMapper; +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.PRODUCTPUTAWAY_JOB_DETAIL_NOT_EXISTS; /** * 制品上架任务子 Service 实现类 @@ -83,4 +83,8 @@ public class ProductputawayJobDetailServiceImpl implements ProductputawayJobDeta return productputawayJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayJobDetailSeniorList(CustomConditions conditions) { + return productputawayJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index cac042f2..414ee511 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架任务主 Service 接口 @@ -78,4 +80,12 @@ public interface ProductputawayJobMainService { * @return 采购订单主列表 */ public ProductputawayJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index 745e32b1..822e7609 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -1,25 +1,25 @@ package com.win.module.wms.service.productputawayJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobMainMapper; 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.productputawayJob.ProductputawayJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; -import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobMainMapper; +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.PRODUCTPUTAWAY_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR; /** * 制品上架任务主 Service 实现类 @@ -96,4 +96,9 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe throw exception(PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getProductputawayJobMainSenior(CustomConditions conditions) { + return productputawayJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java index c03cb499..cbd85ce2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductputawayRecordDetailService { */ List getProductputawayRecordDetailList(ProductputawayRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java index 8a569851..c395ca2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productputawayRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; +import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordDetailMapper; 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.productputawayRecord.ProductputawayRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; -import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordDetailMapper; +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.PRODUCTPUTAWAY_RECORD_DETAIL_NOT_EXISTS; /** * 制品上架记录子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductputawayRecordDetailServiceImpl implements ProductputawayReco return productputawayRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRecordDetailSenior(CustomConditions conditions) { + return productputawayRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java index fab036bb..b1bc0684 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductputawayRecordMainService { */ List getProductputawayRecordMainList(ProductputawayRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java index 8bc86996..deb7996d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productputawayRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainUpdateReqVO; +import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; +import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordMainMapper; 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.productputawayRecord.ProductputawayRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; -import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordMainMapper; +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.PRODUCTPUTAWAY_RECORD_MAIN_NOT_EXISTS; /** * 制品上架记录主 Service 实现类 @@ -83,4 +83,8 @@ public class ProductputawayRecordMainServiceImpl implements ProductputawayRecord return productputawayRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRecordMainSenior(CustomConditions conditions) { + return productputawayRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java index ff3c4a1c..bfd80d41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductputawayRequestDetailService { */ List getProductputawayRequestDetailList(ProductputawayRequestDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRequestDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java index 2329b12b..ae1677d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productputawayRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailUpdateReqVO; +import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; +import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestDetailMapper; 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.productputawayRequest.ProductputawayRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; -import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestDetailMapper; +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.PRODUCTPUTAWAY_REQUEST_DETAIL_NOT_EXISTS; /** * 制品上架申请子 Service 实现类 @@ -83,4 +83,9 @@ public class ProductputawayRequestDetailServiceImpl implements ProductputawayReq return productputawayRequestDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRequestDetailSenior(CustomConditions conditions) { + return productputawayRequestDetailMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java index 50cfc037..ea546a91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架申请主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductputawayRequestMainService { */ List getProductputawayRequestMainList(ProductputawayRequestMainExportReqVO exportReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java index 738350e0..1d0dbc00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productputawayRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainUpdateReqVO; +import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; +import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestMainMapper; 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.productputawayRequest.ProductputawayRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; -import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestMainMapper; +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.PRODUCTPUTAWAY_REQUEST_MAIN_NOT_EXISTS; /** * 制品上架申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductputawayRequestMainServiceImpl implements ProductputawayReque return productputawayRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRequestMainSenior(CustomConditions conditions) { + return productputawayRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java index 25941c33..8fc831ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货任务子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptJobDetailService { */ List getProductreceiptJobDetailList(ProductreceiptJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptJobDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java index 57db15ff..97427291 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailUpdateReqVO; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; +import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; 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.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; -import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; +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.PRODUCTRECEIPT_JOB_DETAIL_NOT_EXISTS; /** * 制品收货任务子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptJobDetailServiceImpl implements ProductreceiptJobDeta return productreceiptJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptJobDetailSenior(CustomConditions conditions) { + return productreceiptJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index ffef8961..6aae1461 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -1,15 +1,17 @@ package com.win.module.wms.service.productreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货任务主 Service 接口 @@ -87,4 +89,12 @@ public interface ProductreceiptJobMainService { * @return 采购订单主列表 */ public ProductreceiptJobMainDO productreceiptJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index 480aea44..d9931a06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -1,27 +1,27 @@ package com.win.module.wms.service.productreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobMainMapper; import com.win.module.wms.service.production.ProductionMainService; 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.productreceiptJob.ProductreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; -import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobMainMapper; +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.PRODUCTRECEIPT_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR; /** * 制品收货任务主 Service 实现类 @@ -107,4 +107,9 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe throw exception(PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getProductreceiptJobMainSenior(CustomConditions conditions) { + return productreceiptJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java index 43ea6461..c2a63069 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; @@ -72,4 +73,11 @@ public interface BackflushRecordDetailbService { */ List getBackflushRecordDetailbList(BackflushRecordDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getBackflushRecordDetailbSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java index fdb1236e..decff0eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java @@ -1,11 +1,13 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbUpdateReqVO; import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import com.win.module.wms.dal.mysql.productreceiptRecord.BackflushRecordDetailbMapper; import org.springframework.stereotype.Service; @@ -82,4 +84,8 @@ public class BackflushRecordDetailbServiceImpl implements BackflushRecordDetailb return productreceiptRecordDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getBackflushRecordDetailbSenior(CustomConditions conditions) { + return productreceiptRecordDetailbMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java index adfd0372..adac95a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptRecordDetailService { */ List getProductreceiptRecordDetailList(ProductreceiptRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java index 40e8c0bc..b27f2856 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; +import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordDetailMapper; 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.productreceiptRecord.ProductreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; -import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordDetailMapper; +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.PRODUCTRECEIPT_RECORD_DETAIL_NOT_EXISTS; /** * 制品收货记录子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptRecordDetailServiceImpl implements ProductreceiptReco return productreceiptRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRecordDetailSenior(CustomConditions conditions) { + return productreceiptRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java index 3d2106bf..792f8c40 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptRecordMainService { */ List getProductreceiptRecordMainList(ProductreceiptRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java index 7f92c3fb..ca9bbdd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainUpdateReqVO; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; +import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordMainMapper; 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.productreceiptRecord.ProductreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; -import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordMainMapper; +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.PRODUCTRECEIPT_RECORD_MAIN_NOT_EXISTS; /** * 制品收货记录主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptRecordMainServiceImpl implements ProductreceiptRecord return productreceiptRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRecordMainSenior(CustomConditions conditions) { + return productreceiptRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java index a5176511..6db50a94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptRequestDetailService { */ List getProductreceiptRequestDetailList(ProductreceiptRequestDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRequestDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java index 3519ee6e..7f63fa00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailUpdateReqVO; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; +import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestDetailMapper; 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.productreceiptRequest.ProductreceiptRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; -import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestDetailMapper; +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.PRODUCTRECEIPT_REQUEST_DETAIL_NOT_EXISTS; /** * 制品收货申请子 Service 实现类 @@ -83,4 +83,8 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq return productreceiptRequestDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRequestDetailSenior(CustomConditions conditions) { + return productreceiptRequestDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java index dcca9294..7de1dab9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货申请主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductreceiptRequestMainService { */ List getProductreceiptRequestMainList(ProductreceiptRequestMainExportReqVO exportReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java index 276bfb44..969faab1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainUpdateReqVO; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; +import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestMainMapper; 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.productreceiptRequest.ProductreceiptRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; -import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestMainMapper; +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.PRODUCTRECEIPT_REQUEST_MAIN_NOT_EXISTS; /** * 制品收货申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque return productreceiptRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRequestMainSenior(CustomConditions conditions) { + return productreceiptRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java index 3427cd8a..b0c54b7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; @@ -72,4 +73,11 @@ public interface ConsumeRecordDetailbService { */ List getConsumeRecordDetailbList(ConsumeRecordDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getConsumeRecordDetailbSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java index 92b5977e..d3d8cc2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java @@ -1,11 +1,13 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO; import com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import com.win.module.wms.dal.mysql.productrepairRecord.ConsumeRecordDetailbMapper; import org.springframework.stereotype.Service; @@ -82,4 +84,8 @@ public class ConsumeRecordDetailbServiceImpl implements ConsumeRecordDetailbServ return consumeRecordDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getConsumeRecordDetailbSenior(CustomConditions conditions) { + return consumeRecordDetailbMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java index 83bfc5bf..7898d421 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRecordDetailService { */ List getProductrepairRecordDetailList(ProductrepairRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java index 085be130..6304802e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; +import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordDetailMapper; 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.productrepairRecord.ProductrepairRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; -import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordDetailMapper; +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.PRODUCTREPAIR_RECORD_DETAIL_NOT_EXISTS; /** * 制品返修记录子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductrepairRecordDetailServiceImpl implements ProductrepairRecord return productrepairRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRecordDetailSenior(CustomConditions conditions) { + return productrepairRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java index a2481992..975c8304 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRecordMainService { */ List getProductrepairRecordMainList(ProductrepairRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java index 172772aa..b658a61b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainUpdateReqVO; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; +import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordMainMapper; 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.productrepairRecord.ProductrepairRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; -import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordMainMapper; +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.PRODUCTREPAIR_RECORD_MAIN_NOT_EXISTS; /** * 制品返修记录主 Service 实现类 @@ -83,4 +83,8 @@ public class ProductrepairRecordMainServiceImpl implements ProductrepairRecordMa return productrepairRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRecordMainSenior(CustomConditions conditions) { + return productrepairRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java index 85ba2a7f..af5e46a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRequestDetailaService { */ List getProductrepairRequestDetailaList(ProductrepairRequestDetailaExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRequestDetailaSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java index b78b5bdf..4ea5c7e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java @@ -1,23 +1,24 @@ 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.ProductrepairRequestDetailaCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaUpdateReqVO; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; +import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestDetailaMapper; 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.productrepairRequest.ProductrepairRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; -import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestDetailaMapper; +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.PRODUCTREPAIR_REQUEST_DETAILA_NOT_EXISTS; /** * 制品返修申请子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ return productrepairRequestDetailaMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRequestDetailaSenior(CustomConditions conditions) { + return productrepairRequestDetailaMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java index 4881aac6..a02029f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java @@ -81,4 +81,11 @@ public interface ProductrepairRequestDetailbService { */ List getConsumereRequestDetailbList(ProductrepairRequestDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRequestDetailbSenior(CustomConditions conditions); } 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 index c5f25b0c..5c4d0443 100644 --- 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 @@ -86,4 +86,9 @@ public class ProductrepairRequestDetailbServiceImpl implements ProductrepairRequ return productrepairRequestDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRequestDetailbSenior(CustomConditions conditions) { + return productrepairRequestDetailbMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java index 2ae4565e..0e3e841d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修申请主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRequestMainService { */ List getProductrepairRequestMainList(ProductrepairRequestMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index d914eb16..32c20270 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java @@ -1,23 +1,24 @@ 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.ProductrepairRequestMainCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainUpdateReqVO; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; +import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestMainMapper; 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.productrepairRequest.ProductrepairRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; -import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestMainMapper; +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.PRODUCTREPAIR_REQUEST_MAIN_NOT_EXISTS; /** * 制品返修申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest return productrepairRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRequestMainSenior(CustomConditions conditions) { + return productrepairRequestMainMapper.selectSenior(conditions); + } } From 04fcdda604e22b77cf76a6391223de6214e34c7f Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 31 Oct 2023 08:43:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BB=A3=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 | 5 ++-- .../vo/DeliverRecordDetailBaseVO.java | 2 ++ .../ProductreceiptJobMainController.java | 3 --- .../BackflushRecordDetailbController.java | 3 --- .../ProductreceiptRecordDetailController.java | 3 --- .../ProductreceiptRecordMainController.java | 3 --- ...ProductreceiptRequestDetailController.java | 3 --- .../ProductreceiptRequestMainController.java | 3 --- .../ProductrepairRecordDetailController.java | 3 --- .../ProductrepairRequestMainController.java | 3 --- .../deliverRecord/DeliverRecordDetailDO.java | 10 ++++---- .../DeliverRecordMainService.java | 12 +++++++++ .../DeliverRecordMainServiceImpl.java | 25 +++++++++++++++++++ .../wms/service/shift/ShiftService.java | 8 ++++++ .../wms/service/shift/ShiftServiceImpl.java | 13 ++++++++++ .../module/wms/service/team/TeamService.java | 7 ++++++ .../wms/service/team/TeamServiceImpl.java | 13 ++++++++++ 17 files changed, 88 insertions(+), 31 deletions(-) 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 ad3ae892..7d285dc4 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 @@ -675,8 +675,9 @@ public interface ErrorCodeConstants { ErrorCode DELIVER_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_120_001, "发货任务子不存在"); ErrorCode DELIVER_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_120_003, "发货任务状态错误"); //发货记录ErrorCode - ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "发货记录主不存在"); - ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "发货记录子不存在"); + ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在"); + ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在"); + ErrorCode DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS = new ErrorCode(1_000_121_002, "采购收货记录明细：销售订单号或销售订单行或物品代码无效"); //客户收货申请ErrorCode ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在"); ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java index 31b56a5b..034f71b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java @@ -116,4 +116,6 @@ public class DeliverRecordDetailBaseVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "是否可用") + private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java index 31ecfd03..658c7c85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductreceiptJobMainRespVO; import com.win.module.wms.controller.productreceiptJob.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptJobMainConvert; import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptJobMainDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java index a4e81f0d..31bc1d83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.BackflushRecordDetailbRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.BackflushRecordDetailbConvert; import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.BackflushRecordDetailbDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import com.win.module.wms.service.productreceiptRecord.BackflushRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java index 2336f159..af3b211b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductreceiptRecordDetailRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRecordDetailConvert; import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java index ae9198d6..45ba617b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductreceiptRecordMainRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRecordMainConvert; import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordMainDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java index 52b4b01e..0d7aae13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductreceiptRequestDetailRespVO; import com.win.module.wms.controller.productreceiptRequest.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRequestDetailConvert; import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java index a7a93dec..aa9cc3ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductreceiptRequestMainRespVO; import com.win.module.wms.controller.productreceiptRequest.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRequestMainConvert; import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestMainDO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java index 04879ca3..a384dbd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductrepairRecordDetailRespVO; import com.win.module.wms.controller.productrepairRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductrepairRecordDetailConvert; import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRecordDetailDO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java index 8f4d1461..58c53c20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java @@ -7,11 +7,8 @@ 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.accountcalendar.vo.ProductrepairRequestMainRespVO; import com.win.module.wms.controller.productrepairRequest.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductrepairRequestMainConvert; import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRequestMainDO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java index dc9b692a..f5b945ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java @@ -1,10 +1,7 @@ package com.win.module.wms.dal.dataobject.deliverRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; @@ -158,5 +155,8 @@ public class DeliverRecordDetailDO extends BaseDO { * 任务明细ID */ private String jobDetailId; - + /** + * 是否可用 + */ + private String available; } 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 b44dc77b..a933a95b 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 @@ -8,6 +8,7 @@ import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReq import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -48,6 +49,17 @@ public interface DeliverRecordMainService { */ DeliverRecordMainDO getDeliverRecordMain(Long id); + /** + * Record-----VPD + * 校验成品发货记录 + * author chenfang + * @param pnumber 单据号 + * @param pitemCode 物品代码 + * @param psoNumber 销售订单号 + * @param psoLine 销售订单行 + * @return + */ + DeliverRecordDetailDO selectDeliverRecordExist(String pnumber, String pitemCode, String psoNumber, String psoLine); /** * 获得发货记录主列表 * 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 5aa31c35..1c4d876e 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,10 +1,13 @@ package com.win.module.wms.service.deliverRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; +import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,6 +35,9 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { @Resource private DeliverRecordMainMapper deliverRecordMainMapper; + @Resource + private DeliverRecordDetailMapper deliverRecordDetailMapper; + @Override public Long createDeliverRecordMain(DeliverRecordMainCreateReqVO createReqVO) { // 插入 @@ -69,6 +75,25 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { return deliverRecordMainMapper.selectById(id); } + @Override + public DeliverRecordDetailDO selectDeliverRecordExist(String pnumber,String pitemCode,String psoNumber,String psoLine){ + QueryWrapper queryWrapperMain = new QueryWrapper(); + queryWrapperMain.eq("number",pnumber); + DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainMapper.selectOne(queryWrapperMain); + if(deliverRecordMainDO != null && "TRUE".equals(deliverRecordMainDO)){ + QueryWrapper queryWrapperDetail = new QueryWrapper(); + queryWrapperDetail.eq("itemcode",pitemCode); + queryWrapperDetail.eq("so_number",psoNumber); + queryWrapperDetail.eq("so_line",psoLine); + DeliverRecordDetailDO deliverRecordDetailDO = deliverRecordDetailMapper.selectOne(queryWrapperDetail); + if(deliverRecordDetailDO != null && "TRUE".equals(deliverRecordDetailDO.getAvailable())){ + return deliverRecordDetailDO; + }else { + throw exception(DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS); + } + } + return null; + } @Override public List getDeliverRecordMainList(Collection ids) { return deliverRecordMainMapper.selectBatchIds(ids); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java index 9311496c..4136cbb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java @@ -52,6 +52,14 @@ public interface ShiftService { */ ShiftDO getShift(Long id); + /** + * BQ---QS + * 查询班次是否有效 + * @author chenfang + * @param pcode 班组code + * @return 班次 + */ + ShiftDO selectShiftExist(String pcode); /** * 获得班次列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java index cd816753..e8edb752 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.shift; 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; @@ -70,6 +71,18 @@ public class ShiftServiceImpl implements ShiftService { return shiftMapper.selectById(id); } + @Override + public ShiftDO selectShiftExist(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + ShiftDO shiftDO = shiftMapper.selectOne(queryWrapper); + if(shiftDO != null && "TRUE".equals(shiftDO.getAvailable())){ + return shiftDO; + }else { + return null; + } + } + @Override public List getShiftList(Collection ids) { return shiftMapper.selectBatchIds(ids); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java index 6c6e7ecf..3c217fc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java @@ -57,6 +57,13 @@ public interface TeamService { */ TeamDO getTeam(Long id); + /** + * BQ---QT + * 查询班组 + * @param pcode + * @return + */ + TeamDO selectTeamExist(String pcode); /** * 获得班组列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java index 6005192a..0ebaaa9a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.team; 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; @@ -72,6 +73,18 @@ public class TeamServiceImpl implements TeamService { return teamMapper.selectById(id); } + @Override + public TeamDO selectTeamExist(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + TeamDO teamDO = teamMapper.selectOne(queryWrapper); + if(teamDO != null && "TRUE".equals(teamDO.getAvailable())){ + return teamDO; + }else { + return null; + } + } + @Override public List getTeamList(Collection ids) { return teamMapper.selectBatchIds(ids); From f38084613fbfc97f4803387a4665e145ffaa01d8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 31 Oct 2023 08:43:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/module/wms/until/job/JobUtils.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java index cc1528f0..5cdf4e4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java @@ -256,7 +256,6 @@ public class JobUtils { * @param pitemCode 物品代码 * @return 上架策略信息 * @author chenfang - * @author chenfang */ public RuleRespVO selectLocationAndModRelation(String pitemCode) { RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null); @@ -267,8 +266,8 @@ public class JobUtils { } } - //DBT---DBT2---IT 物料类型检验是否一致 - public boolean ifInType(String pitemCode, BusinesstypeDO businesstypeDO) { + //DBT---DBT2---IT 物料类型检验-----按物料代码 + public boolean selectItembasicExist(String pitemCode, BusinesstypeDO businesstypeDO) { ItembasicDO itembasicDO = itembasicService.selectItembasic(pitemCode); boolean ifInType = false; if (itembasicDO != null) { @@ -286,6 +285,21 @@ public class JobUtils { } } + //DBT---DBT2---IT1 物料类型检验-----按物料类型 + public boolean ifInType(String pitemType, BusinesstypeDO businesstypeDO) { + boolean ifInType = false; + String[] itemType = businesstypeDO.getItemTypes().split(","); + for (int i = 0; i < itemType.length; i++) { + if (pitemType.equals(itemType[i])) { + ifInType = true; + } + } + if (ifInType == true) { + return true; + } else { + throw exception(ITEMBASIC_TYPE_AND_BUSINESSTYPE_NOT_EQUALS); + } + } //DBT---DBT2---IS 物料状态检验是否一致 public boolean ifInStatus(String pitemCode, BusinesstypeDO businesstypeDO) { ItembasicDO itembasicDO = itembasicService.selectItembasic(pitemCode); From c9d5c8d259f4a679e528fdbdb9c4ecc670c0389c Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Tue, 31 Oct 2023 09:05:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProductrepairRequestDetailbController.java | 15 ------------ .../vo/PurchasereturnJobDetailBaseVO.java | 14 +++++------ .../vo/PurchasereturnJobDetailRespVO.java | 2 -- .../RepleinshRequestMainMapper.java | 12 +++++++--- .../TransferreceiptRequestDetailMapper.java | 12 +++++++--- .../production/ProductionMainServiceImpl.java | 3 +-- .../RepleinshRequestMainServiceImpl.java | 23 +++++++++++-------- ...ansferreceiptRequestDetailServiceImpl.java | 23 +++++++++++-------- 8 files changed, 53 insertions(+), 51 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java index 75d66e29..7e2fc630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java @@ -118,19 +118,4 @@ public class ProductrepairRequestDetailbController { } ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas); } - - @PostMapping("/senior") - @Operation(summary = "高级搜索获得制品返修申请子分页") - @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") - public CommonResult> getProductrepairRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) { - PageResult pageResult = productrepairRequestDetailbService.getProductrepairRequestDetailbSenior(conditions); - PageResult result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult); - for(ProductrepairRequestDetailbRespVO vo : result.getList()) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - return success(result); - } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java index 9ae90860..3db6ef9b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java @@ -1,12 +1,12 @@ package com.win.module.wms.controller.purchasereturnJob.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +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; @@ -91,11 +91,9 @@ public class PurchasereturnJobDetailBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; - @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建者Id不能为空") - private Long creator; + @Schema(description = "创建者id") + private String creator; @Schema(description = "到货主代码") private String toOwnerCode; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java index f11ebd52..3fadae89 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java @@ -8,6 +8,4 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PurchasereturnJobDetailRespVO extends PurchasereturnJobDetailBaseVO { - @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/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java index 83efa645..fbf351bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.repleinshRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 补料申请主 Mapper * @@ -45,6 +47,10 @@ public interface RepleinshRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(RepleinshRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRequestMainDO::getFomWarehouseCode, reqVO.getFomWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java index ad3d10e2..670ad7e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.transferreceiptRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 调拨入库申请子 Mapper * @@ -43,6 +45,10 @@ public interface TransferreceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(TransferreceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index c67c9ef4..dd566464 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -8,7 +8,6 @@ import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; @@ -119,7 +118,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override - public PageResult getProductionMainSenior(CustomConditions conditions) { + public PageResult getProductionMainSenior(CustomConditions conditions) { return productionMainMapper.selectSenior(conditions); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java index fbfab4fe..e29e14a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.repleinshRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainPageReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainUpdateReqVO; +import com.win.module.wms.convert.repleinshRequest.RepleinshRequestMainConvert; +import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestMainDO; +import com.win.module.wms.dal.mysql.repleinshRequest.RepleinshRequestMainMapper; 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.repleinshRequest.RepleinshRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.repleinshRequest.RepleinshRequestMainConvert; -import com.win.module.wms.dal.mysql.repleinshRequest.RepleinshRequestMainMapper; +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.REPLEINSH_REQUEST_MAIN_NOT_EXISTS; /** * 补料申请主 Service 实现类 @@ -40,6 +40,11 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ return repleinshRequestMain.getId(); } + @Override + public PageResult getRepleinshRequestMainSenior(CustomConditions conditions) { + return repleinshRequestMainMapper.selectSenior(conditions); + } + @Override public void updateRepleinshRequestMain(RepleinshRequestMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java index 1b45056f..18d8586a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.transferreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailPageReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailUpdateReqVO; +import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestDetailDO; +import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestDetailMapper; 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.transferreceiptRequest.TransferreceiptRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestDetailConvert; -import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestDetailMapper; +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.TRANSFERRECEIPT_REQUEST_DETAIL_NOT_EXISTS; /** * 调拨入库申请子 Service 实现类 @@ -49,6 +49,11 @@ public class TransferreceiptRequestDetailServiceImpl implements TransferreceiptR transferreceiptRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getTransferreceiptRequestDetailSenior(CustomConditions conditions) { + return transferreceiptRequestDetailMapper.selectSenior(conditions); + } + @Override public void deleteTransferreceiptRequestDetail(Long id) { // 校验存在