lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

盘点管理

Browse Source
This commit is contained in:
liuhanqing
2025-05-30 16:52:15 +08:00
parent 37d45aa395
commit 4a30b431bb
12 changed files with 300 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1,7 +1,11 @@
package com.ruoyi.check.stockcheckdetail.controller; package com.ruoyi.check.stockcheckdetail.controller;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; 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.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
/** /**
* 盘库单据子信息Controller * 盘库单据子信息Controller
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-29 * @date 2025-05-29
*/ */
@@ -33,6 +37,8 @@ public class CheckStockinDetailController extends BaseController
{ {
@Autowired @Autowired
private ICheckStockinDetailService checkStockinDetailService; private ICheckStockinDetailService checkStockinDetailService;
@Autowired
private ICheckStockinDetailFinishService checkStockinDetailFinishService;
/** /**
* 查询盘库单据子信息列表 * 查询盘库单据子信息列表
@@ -42,7 +48,12 @@ public class CheckStockinDetailController extends BaseController
public TableDataInfo list(CheckStockinDetail checkStockinDetail) public TableDataInfo list(CheckStockinDetail checkStockinDetail)
{ {
startPage(); 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); return getDataTable(list);
} }

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

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

20
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/mapper/CheckStockinDetailFinishMapper.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.check.stockcheckdetailfinish.mapper; package com.ruoyi.check.stockcheckdetailfinish.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish; import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
/** /**
* 盘库历史单据子信息Mapper接口 * 盘库历史单据子信息Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-29 * @date 2025-05-29
*/ */
public interface CheckStockinDetailFinishMapper public interface CheckStockinDetailFinishMapper
{ {
/** /**
* 查询盘库历史单据子信息 * 查询盘库历史单据子信息
* *
* @param stockCheckDetailId 盘库历史单据子信息主键 * @param stockCheckDetailId 盘库历史单据子信息主键
* @return 盘库历史单据子信息 * @return 盘库历史单据子信息
*/ */
@@ -21,7 +23,7 @@ public interface CheckStockinDetailFinishMapper
/** /**
* 查询盘库历史单据子信息列表 * 查询盘库历史单据子信息列表
* *
* @param checkStockinDetailFinish 盘库历史单据子信息 * @param checkStockinDetailFinish 盘库历史单据子信息
* @return 盘库历史单据子信息集合 * @return 盘库历史单据子信息集合
*/ */
@@ -29,7 +31,7 @@ public interface CheckStockinDetailFinishMapper
/** /**
* 新增盘库历史单据子信息 * 新增盘库历史单据子信息
* *
* @param checkStockinDetailFinish 盘库历史单据子信息 * @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果 * @return 结果
*/ */
@@ -37,7 +39,7 @@ public interface CheckStockinDetailFinishMapper
/** /**
* 修改盘库历史单据子信息 * 修改盘库历史单据子信息
* *
* @param checkStockinDetailFinish 盘库历史单据子信息 * @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果 * @return 结果
*/ */
@@ -45,7 +47,7 @@ public interface CheckStockinDetailFinishMapper
/** /**
* 删除盘库历史单据子信息 * 删除盘库历史单据子信息
* *
* @param stockCheckDetailId 盘库历史单据子信息主键 * @param stockCheckDetailId 盘库历史单据子信息主键
* @return 结果 * @return 结果
*/ */
@@ -53,9 +55,11 @@ public interface CheckStockinDetailFinishMapper
/** /**
* 批量删除盘库历史单据子信息 * 批量删除盘库历史单据子信息
* *
* @param stockCheckDetailIds 需要删除的数据主键集合 * @param stockCheckDetailIds 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteCheckStockinDetailFinishByStockCheckDetailIds(String[] stockCheckDetailIds); public int deleteCheckStockinDetailFinishByStockCheckDetailIds(String[] stockCheckDetailIds);
List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail);
} }

4
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/ICheckStockinDetailFinishService.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckdetailfinish.service; package com.ruoyi.check.stockcheckdetailfinish.service;
import java.util.List; import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish; import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
/** /**
@@ -58,4 +60,6 @@ public interface ICheckStockinDetailFinishService
* @return 结果 * @return 结果
*/ */
public int deleteCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId); public int deleteCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId);
List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail);
} }

24
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckdetailfinish.service.impl; package com.ruoyi.check.stockcheckdetailfinish.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper; import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.check.stockcheckdetailfinish.service.ICheckStockinDetailFinishS
/** /**
* 盘库历史单据子信息Service业务层处理 * 盘库历史单据子信息Service业务层处理
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-29 * @date 2025-05-29
*/ */
@Service @Service
public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailFinishService public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailFinishService
{ {
@Autowired @Autowired
private CheckStockinDetailFinishMapper checkStockinDetailFinishMapper; private CheckStockinDetailFinishMapper checkStockinDetailFinishMapper;
/** /**
* 查询盘库历史单据子信息 * 查询盘库历史单据子信息
* *
* @param stockCheckDetailId 盘库历史单据子信息主键 * @param stockCheckDetailId 盘库历史单据子信息主键
* @return 盘库历史单据子信息 * @return 盘库历史单据子信息
*/ */
@@ -33,7 +35,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/** /**
* 查询盘库历史单据子信息列表 * 查询盘库历史单据子信息列表
* *
* @param checkStockinDetailFinish 盘库历史单据子信息 * @param checkStockinDetailFinish 盘库历史单据子信息
* @return 盘库历史单据子信息 * @return 盘库历史单据子信息
*/ */
@@ -45,7 +47,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/** /**
* 新增盘库历史单据子信息 * 新增盘库历史单据子信息
* *
* @param checkStockinDetailFinish 盘库历史单据子信息 * @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果 * @return 结果
*/ */
@@ -57,7 +59,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/** /**
* 修改盘库历史单据子信息 * 修改盘库历史单据子信息
* *
* @param checkStockinDetailFinish 盘库历史单据子信息 * @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果 * @return 结果
*/ */
@@ -69,7 +71,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/** /**
* 批量删除盘库历史单据子信息 * 批量删除盘库历史单据子信息
* *
* @param stockCheckDetailIds 需要删除的盘库历史单据子信息主键 * @param stockCheckDetailIds 需要删除的盘库历史单据子信息主键
* @return 结果 * @return 结果
*/ */
@@ -81,7 +83,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/** /**
* 删除盘库历史单据子信息信息 * 删除盘库历史单据子信息信息
* *
* @param stockCheckDetailId 盘库历史单据子信息主键 * @param stockCheckDetailId 盘库历史单据子信息主键
* @return 结果 * @return 结果
*/ */
@@ -90,4 +92,10 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
{ {
return checkStockinDetailFinishMapper.deleteCheckStockinDetailFinishByStockCheckDetailId(stockCheckDetailId); return checkStockinDetailFinishMapper.deleteCheckStockinDetailFinishByStockCheckDetailId(stockCheckDetailId);
} }
@Override
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) {
return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail);
}
} }

20
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/mapper/CheckStockinFinishMapper.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.check.stockcheckfinish.mapper; package com.ruoyi.check.stockcheckfinish.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish; import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
/** /**
* 盘库历史单据主信息Mapper接口 * 盘库历史单据主信息Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-29 * @date 2025-05-29
*/ */
public interface CheckStockinFinishMapper public interface CheckStockinFinishMapper
{ {
/** /**
* 查询盘库历史单据主信息 * 查询盘库历史单据主信息
* *
* @param stockGuid 盘库历史单据主信息主键 * @param stockGuid 盘库历史单据主信息主键
* @return 盘库历史单据主信息 * @return 盘库历史单据主信息
*/ */
@@ -21,7 +23,7 @@ public interface CheckStockinFinishMapper
/** /**
* 查询盘库历史单据主信息列表 * 查询盘库历史单据主信息列表
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 盘库历史单据主信息集合 * @return 盘库历史单据主信息集合
*/ */
@@ -29,7 +31,7 @@ public interface CheckStockinFinishMapper
/** /**
* 新增盘库历史单据主信息 * 新增盘库历史单据主信息
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 结果 * @return 结果
*/ */
@@ -37,7 +39,7 @@ public interface CheckStockinFinishMapper
/** /**
* 修改盘库历史单据主信息 * 修改盘库历史单据主信息
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 结果 * @return 结果
*/ */
@@ -45,7 +47,7 @@ public interface CheckStockinFinishMapper
/** /**
* 删除盘库历史单据主信息 * 删除盘库历史单据主信息
* *
* @param stockGuid 盘库历史单据主信息主键 * @param stockGuid 盘库历史单据主信息主键
* @return 结果 * @return 结果
*/ */
@@ -53,9 +55,11 @@ public interface CheckStockinFinishMapper
/** /**
* 批量删除盘库历史单据主信息 * 批量删除盘库历史单据主信息
* *
* @param stockGuids 需要删除的数据主键集合 * @param stockGuids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteCheckStockinFinishByStockGuids(String[] stockGuids); public int deleteCheckStockinFinishByStockGuids(String[] stockGuids);
List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin);
} }

20
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/ICheckStockinFinishService.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.check.stockcheckfinish.service; package com.ruoyi.check.stockcheckfinish.service;
import java.util.List; import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish; import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
/** /**
* 盘库历史单据主信息Service接口 * 盘库历史单据主信息Service接口
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-29 * @date 2025-05-29
*/ */
public interface ICheckStockinFinishService public interface ICheckStockinFinishService
{ {
/** /**
* 查询盘库历史单据主信息 * 查询盘库历史单据主信息
* *
* @param stockGuid 盘库历史单据主信息主键 * @param stockGuid 盘库历史单据主信息主键
* @return 盘库历史单据主信息 * @return 盘库历史单据主信息
*/ */
@@ -21,7 +23,7 @@ public interface ICheckStockinFinishService
/** /**
* 查询盘库历史单据主信息列表 * 查询盘库历史单据主信息列表
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 盘库历史单据主信息集合 * @return 盘库历史单据主信息集合
*/ */
@@ -29,7 +31,7 @@ public interface ICheckStockinFinishService
/** /**
* 新增盘库历史单据主信息 * 新增盘库历史单据主信息
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 结果 * @return 结果
*/ */
@@ -37,7 +39,7 @@ public interface ICheckStockinFinishService
/** /**
* 修改盘库历史单据主信息 * 修改盘库历史单据主信息
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 结果 * @return 结果
*/ */
@@ -45,7 +47,7 @@ public interface ICheckStockinFinishService
/** /**
* 批量删除盘库历史单据主信息 * 批量删除盘库历史单据主信息
* *
* @param stockGuids 需要删除的盘库历史单据主信息主键集合 * @param stockGuids 需要删除的盘库历史单据主信息主键集合
* @return 结果 * @return 结果
*/ */
@@ -53,9 +55,11 @@ public interface ICheckStockinFinishService
/** /**
* 删除盘库历史单据主信息信息 * 删除盘库历史单据主信息信息
* *
* @param stockGuid 盘库历史单据主信息主键 * @param stockGuid 盘库历史单据主信息主键
* @return 结果 * @return 结果
*/ */
public int deleteCheckStockinFinishByStockGuid(String stockGuid); public int deleteCheckStockinFinishByStockGuid(String stockGuid);
List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin);
} }

23
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/impl/CheckStockinFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckfinish.service.impl; package com.ruoyi.check.stockcheckfinish.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper; import com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
/** /**
* 盘库历史单据主信息Service业务层处理 * 盘库历史单据主信息Service业务层处理
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-29 * @date 2025-05-29
*/ */
@Service @Service
public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
{ {
@Autowired @Autowired
private CheckStockinFinishMapper checkStockinFinishMapper; private CheckStockinFinishMapper checkStockinFinishMapper;
/** /**
* 查询盘库历史单据主信息 * 查询盘库历史单据主信息
* *
* @param stockGuid 盘库历史单据主信息主键 * @param stockGuid 盘库历史单据主信息主键
* @return 盘库历史单据主信息 * @return 盘库历史单据主信息
*/ */
@@ -33,7 +35,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/** /**
* 查询盘库历史单据主信息列表 * 查询盘库历史单据主信息列表
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 盘库历史单据主信息 * @return 盘库历史单据主信息
*/ */
@@ -45,7 +47,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/** /**
* 新增盘库历史单据主信息 * 新增盘库历史单据主信息
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 结果 * @return 结果
*/ */
@@ -57,7 +59,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/** /**
* 修改盘库历史单据主信息 * 修改盘库历史单据主信息
* *
* @param checkStockinFinish 盘库历史单据主信息 * @param checkStockinFinish 盘库历史单据主信息
* @return 结果 * @return 结果
*/ */
@@ -69,7 +71,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/** /**
* 批量删除盘库历史单据主信息 * 批量删除盘库历史单据主信息
* *
* @param stockGuids 需要删除的盘库历史单据主信息主键 * @param stockGuids 需要删除的盘库历史单据主信息主键
* @return 结果 * @return 结果
*/ */
@@ -81,7 +83,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/** /**
* 删除盘库历史单据主信息信息 * 删除盘库历史单据主信息信息
* *
* @param stockGuid 盘库历史单据主信息主键 * @param stockGuid 盘库历史单据主信息主键
* @return 结果 * @return 结果
*/ */
@@ -90,4 +92,9 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
{ {
return checkStockinFinishMapper.deleteCheckStockinFinishByStockGuid(stockGuid); return checkStockinFinishMapper.deleteCheckStockinFinishByStockGuid(stockGuid);
} }
@Override
public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin) {
return checkStockinFinishMapper.selectCheckStockinList(checkStockin);
}
} }

80
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper"> <mapper namespace="com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper">
<resultMap type="CheckStockinDetailFinish" id="CheckStockinDetailFinishResult"> <resultMap type="CheckStockinDetailFinish" id="CheckStockinDetailFinishResult">
<result property="stockCheckDetailId" column="stock_check_detail_id" /> <result property="stockCheckDetailId" column="stock_check_detail_id" />
<result property="stockCheckGuid" column="stock_check_guid" /> <result property="stockCheckGuid" column="stock_check_guid" />
@@ -36,6 +36,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNumX" column="scan_num_x" /> <result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" /> <result property="scanNumJ" column="scan_num_j" />
</resultMap> </resultMap>
<resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
<result property="stockCheckDetailId" column="stock_check_detail_id" />
<result property="stockCheckGuid" column="stock_check_guid" />
<result property="stockCheckId" column="stock_check_id" />
<result property="lotNo" column="lot_no" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="remark" column="remark" />
<result property="assignNum" column="assign_num" />
<result property="assignNumX" column="assign_num_x" />
<result property="assignNumJ" column="assign_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<result property="supplierId" column="supplier_id" />
<result property="customerId" column="customer_id" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<sql id="selectCheckStockinDetailVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish
</sql>
<sql id="selectCheckStockinDetailFinishVo"> <sql id="selectCheckStockinDetailFinishVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish
@@ -43,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult"> <select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult">
<include refid="selectCheckStockinDetailFinishVo"/> <include refid="selectCheckStockinDetailFinishVo"/>
<where> <where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if> <if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if> <if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if> <if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -74,11 +110,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if> <if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
</where> </where>
</select> </select>
<select id="selectCheckStockinDetailFinishByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailFinishResult"> <select id="selectCheckStockinDetailFinishByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailFinishResult">
<include refid="selectCheckStockinDetailFinishVo"/> <include refid="selectCheckStockinDetailFinishVo"/>
where stock_check_detail_id = #{stockCheckDetailId} where stock_check_detail_id = #{stockCheckDetailId}
</select> </select>
<select id="selectCheckStockinDetailList"
resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<insert id="insertCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish"> <insert id="insertCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
insert into check_stockin_detail_finish insert into check_stockin_detail_finish
@@ -189,9 +259,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteCheckStockinDetailFinishByStockCheckDetailIds" parameterType="String"> <delete id="deleteCheckStockinDetailFinishByStockCheckDetailIds" parameterType="String">
delete from check_stockin_detail_finish where stock_check_detail_id in delete from check_stockin_detail_finish where stock_check_detail_id in
<foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")"> <foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
#{stockCheckDetailId} #{stockCheckDetailId}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

58
ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper"> <mapper namespace="com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper">
<resultMap type="CheckStockinFinish" id="CheckStockinFinishResult"> <resultMap type="CheckStockinFinish" id="CheckStockinFinishResult">
<result property="stockGuid" column="stock_guid" /> <result property="stockGuid" column="stock_guid" />
<result property="stockCheckId" column="stock_check_id" /> <result property="stockCheckId" column="stock_check_id" />
@@ -25,14 +25,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="classNo" column="class_no" /> <result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" /> <result property="supplierNo" column="supplier_no" />
</resultMap> </resultMap>
<resultMap type="CheckStockin" id="CheckStockinResult">
<result property="stockGuid" column="stock_guid" />
<result property="stockCheckId" column="stock_check_id" />
<result property="checkType" column="check_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="finishDate" column="finish_date" />
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish
</sql>
<sql id="selectCheckStockinFinishVo"> <sql id="selectCheckStockinFinishVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
</sql> </sql>
<select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult"> <select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult">
<include refid="selectCheckStockinFinishVo"/> <include refid="selectCheckStockinFinishVo"/>
<where> <where>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if> <if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if> <if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if> <if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
@@ -53,11 +76,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if> <if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
</where> </where>
</select> </select>
<select id="selectCheckStockinFinishByStockGuid" parameterType="String" resultMap="CheckStockinFinishResult"> <select id="selectCheckStockinFinishByStockGuid" parameterType="String" resultMap="CheckStockinFinishResult">
<include refid="selectCheckStockinFinishVo"/> <include refid="selectCheckStockinFinishVo"/>
where stock_guid = #{stockGuid} where stock_guid = #{stockGuid}
</select> </select>
<select id="selectCheckStockinList" resultMap="CheckStockinResult">
<include refid="selectCheckStockinVo"/>
<where>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
</where>
</select>
<insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish"> <insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">
insert into check_stockin_finish insert into check_stockin_finish
@@ -135,9 +181,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteCheckStockinFinishByStockGuids" parameterType="String"> <delete id="deleteCheckStockinFinishByStockGuids" parameterType="String">
delete from check_stockin_finish where stock_guid in delete from check_stockin_finish where stock_guid in
<foreach item="stockGuid" collection="array" open="(" separator="," close=")"> <foreach item="stockGuid" collection="array" open="(" separator="," close=")">
#{stockGuid} #{stockGuid}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

33
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -20,7 +20,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.checkType" placeholder="请选择盘库类型" clearable> <el-select v-model="queryParams.status" placeholder="请选择盘库类型" clearable>
<el-option <el-option
v-for="dict in dict.type.check_bill_status" v-for="dict in dict.type.check_bill_status"
:key="dict.value" :key="dict.value"
@@ -341,7 +341,8 @@ export default {
queryDetailParams: { queryDetailParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
stockCheckGuid: null stockCheckGuid: null,
status: null
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
@@ -351,7 +352,7 @@ export default {
checkType: '1', checkType: '1',
createDate: null, createDate: null,
createManId: null, createManId: null,
status: null, status: '1',
warehouseId: null, warehouseId: null,
finishDate: null, finishDate: null,
erpBill: null, erpBill: null,
@@ -393,6 +394,7 @@ export default {
/** 行点击事件处理 */ /** 行点击事件处理 */
handleRowClick(row) { handleRowClick(row) {
this.queryDetailParams.stockCheckGuid = row.stockGuid this.queryDetailParams.stockCheckGuid = row.stockGuid
this.queryDetailParams.status = row.status
this.getDetailList() this.getDetailList()
}, },
/** 查询盘库单据主信息列表 */ /** 查询盘库单据主信息列表 */
@@ -474,6 +476,7 @@ export default {
this.multiple = !selection.length this.multiple = !selection.length
if (selection.length === 1) { if (selection.length === 1) {
this.queryDetailParams.stockCheckGuid = selection[0].stockGuid this.queryDetailParams.stockCheckGuid = selection[0].stockGuid
this.queryDetailParams.status = selection[0].status
this.getDetailList() this.getDetailList()
} else { } else {
this.queryDetailParams.stockCheckGuid = null this.queryDetailParams.stockCheckGuid = null
@@ -537,27 +540,3 @@ export default {
} }
</script> </script>
// 明细遮罩层
// 明细选中数组
// 明细总条数
// 明细表格数据
// 明细查询参数
handleDetailSelectionChange(selection) {
this.detailIds = selection.map(item => item.stockCheckDetailId)
}
/** 查询明细列表 */
getDetailList() {
this.detailLoading = true
listStockCheckDetail(this.queryDetailParams).then(response => {
this.stockCheckDetailList = response.rows
this.detailTotal = response.total
this.detailLoading = false
})
}
/** 选择主表行 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockGuid)
this.single = selection.length!==1
this.multiple = !selection.length
}
}