diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java index fd91d97..113a45f 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java @@ -46,7 +46,7 @@ public class AllocationBillController { */ @PostMapping("/allocationPage") @Log("分页查询") - public ResponseEntity> allocationPage(@RequestBody AllocationBillQuery params) { + public ResponseEntity> allocationPage(@RequestBody AllocationBillQuery params) throws InterruptedException { return new ResponseEntity<>(allocationBillService.allocationPage(params), HttpStatus.OK); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java index 39b0de1..0220f88 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java @@ -83,6 +83,14 @@ public class EasOutInBillController { return RestBusinessTemplate.execute(() -> easOutInBillService.getBillsCount()); } + /** + * 获取组织机构信息 + */ + @PostMapping("/getOrganizationInfo") + @Log("获取组织机构信息") + public CommonResult> getOrganizationInfo() { + return null; + } /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java index 72830ad..dbfab5f 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java @@ -25,7 +25,7 @@ public interface IallocationBillService extends IService { * @param params 查询条件 * @return IPage */ - CommonPage allocationPage(AllocationBillQuery params); + CommonPage allocationPage(AllocationBillQuery params) throws InterruptedException; /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java index 8f006d5..c005ff8 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java @@ -58,11 +58,12 @@ public class AllocationBillServiceImpl extends ServiceImpl allocationPage(AllocationBillQuery params) { + public CommonPage allocationPage(AllocationBillQuery params) throws InterruptedException { // 查询总记录数 long totalCount = allocationBillMapper.getAllocationCount(); Page pageObject = new Page<>(params.getPage(), params.getSize()); Page allocationBills = allocationBillMapper.allocationPage(pageObject, params.getFuzzy()); + Thread.sleep(5000); return CommonPage.getPage(allocationBills, totalCount); }