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;
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);
}

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;
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);
}

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
*
*
* @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;
}

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;
import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
/**
* 盘库历史单据子信息Mapper接口
*
*
* @author ruoyi
* @date 2025-05-29
*/
public interface CheckStockinDetailFinishMapper
public interface CheckStockinDetailFinishMapper
{
/**
* 查询盘库历史单据子信息
*
*
* @param stockCheckDetailId 盘库历史单据子信息主键
* @return 盘库历史单据子信息
*/
@@ -21,7 +23,7 @@ public interface CheckStockinDetailFinishMapper
/**
* 查询盘库历史单据子信息列表
*
*
* @param checkStockinDetailFinish 盘库历史单据子信息
* @return 盘库历史单据子信息集合
*/
@@ -29,7 +31,7 @@ public interface CheckStockinDetailFinishMapper
/**
* 新增盘库历史单据子信息
*
*
* @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface CheckStockinDetailFinishMapper
/**
* 修改盘库历史单据子信息
*
*
* @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface CheckStockinDetailFinishMapper
/**
* 删除盘库历史单据子信息
*
*
* @param stockCheckDetailId 盘库历史单据子信息主键
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface CheckStockinDetailFinishMapper
/**
* 批量删除盘库历史单据子信息
*
*
* @param stockCheckDetailIds 需要删除的数据主键集合
* @return 结果
*/
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;
import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
/**
@@ -58,4 +60,6 @@ public interface ICheckStockinDetailFinishService
* @return 结果
*/
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;
import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.check.stockcheckdetailfinish.service.ICheckStockinDetailFinishS
/**
* 盘库历史单据子信息Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-29
*/
@Service
public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailFinishService
public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailFinishService
{
@Autowired
private CheckStockinDetailFinishMapper checkStockinDetailFinishMapper;
/**
* 查询盘库历史单据子信息
*
*
* @param stockCheckDetailId 盘库历史单据子信息主键
* @return 盘库历史单据子信息
*/
@@ -33,7 +35,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/**
* 查询盘库历史单据子信息列表
*
*
* @param checkStockinDetailFinish 盘库历史单据子信息
* @return 盘库历史单据子信息
*/
@@ -45,7 +47,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/**
* 新增盘库历史单据子信息
*
*
* @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果
*/
@@ -57,7 +59,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/**
* 修改盘库历史单据子信息
*
*
* @param checkStockinDetailFinish 盘库历史单据子信息
* @return 结果
*/
@@ -69,7 +71,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/**
* 批量删除盘库历史单据子信息
*
*
* @param stockCheckDetailIds 需要删除的盘库历史单据子信息主键
* @return 结果
*/
@@ -81,7 +83,7 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
/**
* 删除盘库历史单据子信息信息
*
*
* @param stockCheckDetailId 盘库历史单据子信息主键
* @return 结果
*/
@@ -90,4 +92,10 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
{
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;
import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
/**
* 盘库历史单据主信息Mapper接口
*
*
* @author ruoyi
* @date 2025-05-29
*/
public interface CheckStockinFinishMapper
public interface CheckStockinFinishMapper
{
/**
* 查询盘库历史单据主信息
*
*
* @param stockGuid 盘库历史单据主信息主键
* @return 盘库历史单据主信息
*/
@@ -21,7 +23,7 @@ public interface CheckStockinFinishMapper
/**
* 查询盘库历史单据主信息列表
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 盘库历史单据主信息集合
*/
@@ -29,7 +31,7 @@ public interface CheckStockinFinishMapper
/**
* 新增盘库历史单据主信息
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface CheckStockinFinishMapper
/**
* 修改盘库历史单据主信息
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface CheckStockinFinishMapper
/**
* 删除盘库历史单据主信息
*
*
* @param stockGuid 盘库历史单据主信息主键
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface CheckStockinFinishMapper
/**
* 批量删除盘库历史单据主信息
*
*
* @param stockGuids 需要删除的数据主键集合
* @return 结果
*/
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;
import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
/**
* 盘库历史单据主信息Service接口
*
*
* @author ruoyi
* @date 2025-05-29
*/
public interface ICheckStockinFinishService
public interface ICheckStockinFinishService
{
/**
* 查询盘库历史单据主信息
*
*
* @param stockGuid 盘库历史单据主信息主键
* @return 盘库历史单据主信息
*/
@@ -21,7 +23,7 @@ public interface ICheckStockinFinishService
/**
* 查询盘库历史单据主信息列表
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 盘库历史单据主信息集合
*/
@@ -29,7 +31,7 @@ public interface ICheckStockinFinishService
/**
* 新增盘库历史单据主信息
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface ICheckStockinFinishService
/**
* 修改盘库历史单据主信息
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface ICheckStockinFinishService
/**
* 批量删除盘库历史单据主信息
*
*
* @param stockGuids 需要删除的盘库历史单据主信息主键集合
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface ICheckStockinFinishService
/**
* 删除盘库历史单据主信息信息
*
*
* @param stockGuid 盘库历史单据主信息主键
* @return 结果
*/
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;
import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
/**
* 盘库历史单据主信息Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-29
*/
@Service
public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
{
@Autowired
private CheckStockinFinishMapper checkStockinFinishMapper;
/**
* 查询盘库历史单据主信息
*
*
* @param stockGuid 盘库历史单据主信息主键
* @return 盘库历史单据主信息
*/
@@ -33,7 +35,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/**
* 查询盘库历史单据主信息列表
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 盘库历史单据主信息
*/
@@ -45,7 +47,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/**
* 新增盘库历史单据主信息
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 结果
*/
@@ -57,7 +59,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/**
* 修改盘库历史单据主信息
*
*
* @param checkStockinFinish 盘库历史单据主信息
* @return 结果
*/
@@ -69,7 +71,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/**
* 批量删除盘库历史单据主信息
*
*
* @param stockGuids 需要删除的盘库历史单据主信息主键
* @return 结果
*/
@@ -81,7 +83,7 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
/**
* 删除盘库历史单据主信息信息
*
*
* @param stockGuid 盘库历史单据主信息主键
* @return 结果
*/
@@ -90,4 +92,9 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
{
return checkStockinFinishMapper.deleteCheckStockinFinishByStockGuid(stockGuid);
}
@Override
public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin) {
return checkStockinFinishMapper.selectCheckStockinList(checkStockin);
}
}