盘点管理

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java

@@ -1,7 +1,11 @@
 package com.ruoyi.check.stockcheck.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 盘库单据主信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-29
  */
@@ -33,6 +37,8 @@ public class CheckStockinController extends BaseController
 {
     @Autowired
     private ICheckStockinService checkStockinService;
+    @Autowired
+    private ICheckStockinFinishService  checkStockinFinishService;
 
     /**
      * 查询盘库单据主信息列表
@@ -42,7 +48,13 @@ public class CheckStockinController extends BaseController
     public TableDataInfo list(CheckStockin checkStockin)
     {
         startPage();
-        List<CheckStockin> list = checkStockinService.selectCheckStockinList(checkStockin);
+        List<CheckStockin> list = new ArrayList<>();
+        if (Convert.toInt(checkStockin.getStatus())<4){
+            list =  checkStockinService.selectCheckStockinList(checkStockin);
+        }else {
+            list = checkStockinFinishService.selectCheckStockinList(checkStockin);
+        }
+
         return getDataTable(list);
     }