From 0402045ebaf3971686156cf173d5f57b2a79159c Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Thu, 25 Jul 2024 10:20:51 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E5=A2=9E=E5=8A=A0=E5=BB=B6=E8=BF=9F?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/eas/controller/AllocationBillController.java | 2 +-
 .../database/eas/controller/EasOutInBillController.java   | 8 ++++++++
 .../wms/database/eas/service/IallocationBillService.java  | 2 +-
 .../eas/service/impl/AllocationBillServiceImpl.java       | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

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<CommonPage<AllocationBill>> allocationPage(@RequestBody AllocationBillQuery params) {
+    public ResponseEntity<CommonPage<AllocationBill>> 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<List<WarehouseInfo>> 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<AllocationBill> {
      * @param params 查询条件
      * @return IPage<EasOutInBill>
      */
-    CommonPage<AllocationBill> allocationPage(AllocationBillQuery params);
+    CommonPage<AllocationBill> 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<AllocationBillMapper,
      */
     @Override
     @SaIgnore
-    public CommonPage<AllocationBill> allocationPage(AllocationBillQuery params) {
+    public CommonPage<AllocationBill> allocationPage(AllocationBillQuery params) throws InterruptedException {
         // 查询总记录数
         long totalCount = allocationBillMapper.getAllocationCount();
         Page<AllocationBill> pageObject = new Page<>(params.getPage(), params.getSize());
         Page<AllocationBill> allocationBills = allocationBillMapper.allocationPage(pageObject, params.getFuzzy());
+        Thread.sleep(5000);
         return CommonPage.getPage(allocationBills, totalCount);
     }