盘点管理

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java

@@ -1,7 +1,11 @@
 package com.ruoyi.check.stockcheckdetail.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.check.stockcheckdetailfinish.service.ICheckStockinDetailFinishService;
 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 CheckStockinDetailController extends BaseController
 {
     @Autowired
     private ICheckStockinDetailService checkStockinDetailService;
+    @Autowired
+    private ICheckStockinDetailFinishService checkStockinDetailFinishService;
 
     /**
      * 查询盘库单据子信息列表
@@ -42,7 +48,12 @@ public class CheckStockinDetailController extends BaseController
     public TableDataInfo list(CheckStockinDetail checkStockinDetail)
     {
         startPage();
-        List<CheckStockinDetail> list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail);
+        List<CheckStockinDetail> list = new ArrayList<>();
+        if (Convert.toInt(checkStockinDetail.getStatus())<4){
+            list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail);
+        }else {
+            list = checkStockinDetailFinishService.selectCheckStockinDetailList(checkStockinDetail);
+        }
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 盘库单据子信息对象 check_stockin_detail
- * 
+ *
  * @author ruoyi
  * @date 2025-05-29
  */
@@ -130,292 +130,302 @@ public class CheckStockinDetail extends BaseEntity
     @Excel(name = "备用字段6")
     private String spare6;
 
-    public void setStockCheckDetailId(String stockCheckDetailId) 
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public void setStockCheckDetailId(String stockCheckDetailId)
     {
         this.stockCheckDetailId = stockCheckDetailId;
     }
 
-    public String getStockCheckDetailId() 
+    public String getStockCheckDetailId()
     {
         return stockCheckDetailId;
     }
 
-    public void setStockCheckGuid(String stockCheckGuid) 
+    public void setStockCheckGuid(String stockCheckGuid)
     {
         this.stockCheckGuid = stockCheckGuid;
     }
 
-    public String getStockCheckGuid() 
+    public String getStockCheckGuid()
     {
         return stockCheckGuid;
     }
 
-    public void setStockCheckId(String stockCheckId) 
+    public void setStockCheckId(String stockCheckId)
     {
         this.stockCheckId = stockCheckId;
     }
 
-    public String getStockCheckId() 
+    public String getStockCheckId()
     {
         return stockCheckId;
     }
 
-    public void setLotNo(String lotNo) 
+    public void setLotNo(String lotNo)
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo() 
+    public String getLotNo()
     {
         return lotNo;
     }
 
-    public void setProductGuid(String productGuid) 
+    public void setProductGuid(String productGuid)
     {
         this.productGuid = productGuid;
     }
 
-    public String getProductGuid() 
+    public String getProductGuid()
     {
         return productGuid;
     }
 
-    public void setProductId(String productId) 
+    public void setProductId(String productId)
     {
         this.productId = productId;
     }
 
-    public String getProductId() 
+    public String getProductId()
     {
         return productId;
     }
 
-    public void setQuantity(String quantity) 
+    public void setQuantity(String quantity)
     {
         this.quantity = quantity;
     }
 
-    public String getQuantity() 
+    public String getQuantity()
     {
         return quantity;
     }
 
-    public void setQuantityX(String quantityX) 
+    public void setQuantityX(String quantityX)
     {
         this.quantityX = quantityX;
     }
 
-    public String getQuantityX() 
+    public String getQuantityX()
     {
         return quantityX;
     }
 
-    public void setQuantityJ(String quantityJ) 
+    public void setQuantityJ(String quantityJ)
     {
         this.quantityJ = quantityJ;
     }
 
-    public String getQuantityJ() 
+    public String getQuantityJ()
     {
         return quantityJ;
     }
 
-    public void setPrice(String price) 
+    public void setPrice(String price)
     {
         this.price = price;
     }
 
-    public String getPrice() 
+    public String getPrice()
     {
         return price;
     }
 
-    public void setCargoNo(String cargoNo) 
+    public void setCargoNo(String cargoNo)
     {
         this.cargoNo = cargoNo;
     }
 
-    public String getCargoNo() 
+    public String getCargoNo()
     {
         return cargoNo;
     }
 
-    public void setAssignNum(String assignNum) 
+    public void setAssignNum(String assignNum)
     {
         this.assignNum = assignNum;
     }
 
-    public String getAssignNum() 
+    public String getAssignNum()
     {
         return assignNum;
     }
 
-    public void setAssignNumX(String assignNumX) 
+    public void setAssignNumX(String assignNumX)
     {
         this.assignNumX = assignNumX;
     }
 
-    public String getAssignNumX() 
+    public String getAssignNumX()
     {
         return assignNumX;
     }
 
-    public void setAssignNumJ(String assignNumJ) 
+    public void setAssignNumJ(String assignNumJ)
     {
         this.assignNumJ = assignNumJ;
     }
 
-    public String getAssignNumJ() 
+    public String getAssignNumJ()
     {
         return assignNumJ;
     }
 
-    public void setPrintDate(String printDate) 
+    public void setPrintDate(String printDate)
     {
         this.printDate = printDate;
     }
 
-    public String getPrintDate() 
+    public String getPrintDate()
     {
         return printDate;
     }
 
-    public void setStockStatus(String stockStatus) 
+    public void setStockStatus(String stockStatus)
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus() 
+    public String getStockStatus()
     {
         return stockStatus;
     }
 
-    public void setSupplierId(String supplierId) 
+    public void setSupplierId(String supplierId)
     {
         this.supplierId = supplierId;
     }
 
-    public String getSupplierId() 
+    public String getSupplierId()
     {
         return supplierId;
     }
 
-    public void setCustomerId(String customerId) 
+    public void setCustomerId(String customerId)
     {
         this.customerId = customerId;
     }
 
-    public String getCustomerId() 
+    public String getCustomerId()
     {
         return customerId;
     }
 
-    public void setUnit(String unit) 
+    public void setUnit(String unit)
     {
         this.unit = unit;
     }
 
-    public String getUnit() 
+    public String getUnit()
     {
         return unit;
     }
 
-    public void setSpec(String spec) 
+    public void setSpec(String spec)
     {
         this.spec = spec;
     }
 
-    public String getSpec() 
+    public String getSpec()
     {
         return spec;
     }
 
-    public void setScanNum(String scanNum) 
+    public void setScanNum(String scanNum)
     {
         this.scanNum = scanNum;
     }
 
-    public String getScanNum() 
+    public String getScanNum()
     {
         return scanNum;
     }
 
-    public void setScanNumX(String scanNumX) 
+    public void setScanNumX(String scanNumX)
     {
         this.scanNumX = scanNumX;
     }
 
-    public String getScanNumX() 
+    public String getScanNumX()
     {
         return scanNumX;
     }
 
-    public void setScanNumJ(String scanNumJ) 
+    public void setScanNumJ(String scanNumJ)
     {
         this.scanNumJ = scanNumJ;
     }
 
-    public String getScanNumJ() 
+    public String getScanNumJ()
     {
         return scanNumJ;
     }
 
-    public void setSpare1(String spare1) 
+    public void setSpare1(String spare1)
     {
         this.spare1 = spare1;
     }
 
-    public String getSpare1() 
+    public String getSpare1()
     {
         return spare1;
     }
 
-    public void setSpare2(String spare2) 
+    public void setSpare2(String spare2)
     {
         this.spare2 = spare2;
     }
 
-    public String getSpare2() 
+    public String getSpare2()
     {
         return spare2;
     }
 
-    public void setSpare3(String spare3) 
+    public void setSpare3(String spare3)
     {
         this.spare3 = spare3;
     }
 
-    public String getSpare3() 
+    public String getSpare3()
     {
         return spare3;
     }
 
-    public void setSpare4(String spare4) 
+    public void setSpare4(String spare4)
     {
         this.spare4 = spare4;
     }
 
-    public String getSpare4() 
+    public String getSpare4()
     {
         return spare4;
     }
 
-    public void setSpare5(String spare5) 
+    public void setSpare5(String spare5)
     {
         this.spare5 = spare5;
     }
 
-    public String getSpare5() 
+    public String getSpare5()
     {
         return spare5;
     }
 
-    public void setSpare6(String spare6) 
+    public void setSpare6(String spare6)
     {
         this.spare6 = spare6;
     }
 
-    public String getSpare6() 
+    public String getSpare6()
     {
         return spare6;
     }