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

501流程测试修改，作废流程添加

Browse Source
This commit is contained in:
liuhanqing
2025-08-04 17:51:44 +08:00
parent a75f289184
commit 00a6c777d4
15 changed files with 1143 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/controller/CheckDifferenceRecordFinishController.java
View File

@@ -2,6 +2,8 @@ package com.ruoyi.check.DifferenceRecordFinish.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* 盘点差异历史Controller
*
*
* @author gw
* @date 2025-06-25
*/
@@ -37,12 +39,12 @@ public class CheckDifferenceRecordFinishController extends BaseController
/**
* 查询盘点差异历史列表
*/
@PreAuthorize("@ss.hasPermi('check:DifferenceRecordFinish:list')")
@PreAuthorize("@ss.hasPermi('check:difference:list')")
@GetMapping("/list")
public TableDataInfo list(CheckDifferenceRecordFinish checkDifferenceRecordFinish)
{
startPage();
List<CheckDifferenceRecordFinish> list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish);
List<CheckDifferenceRecord> list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish);
return getDataTable(list);
}
@@ -54,8 +56,8 @@ public class CheckDifferenceRecordFinishController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, CheckDifferenceRecordFinish checkDifferenceRecordFinish)
{
List<CheckDifferenceRecordFinish> list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish);
ExcelUtil<CheckDifferenceRecordFinish> util = new ExcelUtil<CheckDifferenceRecordFinish>(CheckDifferenceRecordFinish.class);
List<CheckDifferenceRecord> list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish);
ExcelUtil<CheckDifferenceRecord> util = new ExcelUtil<CheckDifferenceRecord>(CheckDifferenceRecord.class);
util.exportExcel(response, list, "盘点差异历史数据");
}

77
ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/domain/CheckDifferenceRecordFinish.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 盘点差异历史对象 check_difference_record_finish
*
*
* @author gw
* @date 2025-06-25
*/
@@ -70,142 +70,161 @@ public class CheckDifferenceRecordFinish extends BaseEntity
@Excel(name = "审核状态")
private String status;
public void setCheckGuid(String checkGuid)
private String warehouseId;
private String warehouseName;
public String getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public void setCheckGuid(String checkGuid)
{
this.checkGuid = checkGuid;
}
public String getCheckGuid()
public String getCheckGuid()
{
return checkGuid;
}
public void setStockId(String stockId)
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getStockId()
public String getStockId()
{
return stockId;
}
public void setTrayCode(String trayCode)
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
public String getTrayCode()
{
return trayCode;
}
public void setCargoSpaceId(String cargoSpaceId)
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
}
public String getCargoSpaceId()
public String getCargoSpaceId()
{
return cargoSpaceId;
}
public void setProductId(String productId)
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
public String getProductId()
{
return productId;
}
public void setLotNo(String lotNo)
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
public String getLotNo()
{
return lotNo;
}
public void setSupplier(String supplier)
public void setSupplier(String supplier)
{
this.supplier = supplier;
}
public String getSupplier()
public String getSupplier()
{
return supplier;
}
public void setCustomer(String customer)
public void setCustomer(String customer)
{
this.customer = customer;
}
public String getCustomer()
public String getCustomer()
{
return customer;
}
public void setOldQuantity(String oldQuantity)
public void setOldQuantity(String oldQuantity)
{
this.oldQuantity = oldQuantity;
}
public String getOldQuantity()
public String getOldQuantity()
{
return oldQuantity;
}
public void setNewQuantity(String newQuantity)
public void setNewQuantity(String newQuantity)
{
this.newQuantity = newQuantity;
}
public String getNewQuantity()
public String getNewQuantity()
{
return newQuantity;
}
public void setRecordType(Long recordType)
public void setRecordType(Long recordType)
{
this.recordType = recordType;
}
public Long getRecordType()
public Long getRecordType()
{
return recordType;
}
public void setProductGuid(String productGuid)
public void setProductGuid(String productGuid)
{
this.productGuid = productGuid;
}
public String getProductGuid()
public String getProductGuid()
{
return productGuid;
}
public void setCheckStockDetailId(String checkStockDetailId)
public void setCheckStockDetailId(String checkStockDetailId)
{
this.checkStockDetailId = checkStockDetailId;
}
public String getCheckStockDetailId()
public String getCheckStockDetailId()
{
return checkStockDetailId;
}
public void setStatus(String status)
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
public String getStatus()
{
return status;
}

21
ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/mapper/CheckDifferenceRecordFinishMapper.java
View File

@@ -2,34 +2,35 @@ package com.ruoyi.check.DifferenceRecordFinish.mapper;
import java.util.List;
import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
/**
* 盘点差异历史Mapper接口
*
*
* @author gw
* @date 2025-06-25
*/
public interface CheckDifferenceRecordFinishMapper
public interface CheckDifferenceRecordFinishMapper
{
/**
* 查询盘点差异历史
*
*
* @param checkGuid 盘点差异历史主键
* @return 盘点差异历史
*/
public CheckDifferenceRecordFinish selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid);
public CheckDifferenceRecord selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid);
/**
* 查询盘点差异历史列表
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 盘点差异历史集合
*/
public List<CheckDifferenceRecordFinish> selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish);
public List<CheckDifferenceRecord> selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish);
/**
* 新增盘点差异历史
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 结果
*/
@@ -37,7 +38,7 @@ public interface CheckDifferenceRecordFinishMapper
/**
* 修改盘点差异历史
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 结果
*/
@@ -45,7 +46,7 @@ public interface CheckDifferenceRecordFinishMapper
/**
* 删除盘点差异历史
*
*
* @param checkGuid 盘点差异历史主键
* @return 结果
*/
@@ -53,7 +54,7 @@ public interface CheckDifferenceRecordFinishMapper
/**
* 批量删除盘点差异历史
*
*
* @param checkGuids 需要删除的数据主键集合
* @return 结果
*/

21
ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/ICheckDifferenceRecordFinishService.java
View File

@@ -2,34 +2,35 @@ package com.ruoyi.check.DifferenceRecordFinish.service;
import java.util.List;
import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
/**
* 盘点差异历史Service接口
*
*
* @author gw
* @date 2025-06-25
*/
public interface ICheckDifferenceRecordFinishService
public interface ICheckDifferenceRecordFinishService
{
/**
* 查询盘点差异历史
*
*
* @param checkGuid 盘点差异历史主键
* @return 盘点差异历史
*/
public CheckDifferenceRecordFinish selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid);
public CheckDifferenceRecord selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid);
/**
* 查询盘点差异历史列表
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 盘点差异历史集合
*/
public List<CheckDifferenceRecordFinish> selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish);
public List<CheckDifferenceRecord> selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish);
/**
* 新增盘点差异历史
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 结果
*/
@@ -37,7 +38,7 @@ public interface ICheckDifferenceRecordFinishService
/**
* 修改盘点差异历史
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 结果
*/
@@ -45,7 +46,7 @@ public interface ICheckDifferenceRecordFinishService
/**
* 批量删除盘点差异历史
*
*
* @param checkGuids 需要删除的盘点差异历史主键集合
* @return 结果
*/
@@ -53,7 +54,7 @@ public interface ICheckDifferenceRecordFinishService
/**
* 删除盘点差异历史信息
*
*
* @param checkGuid 盘点差异历史主键
* @return 结果
*/

22
ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/impl/CheckDifferenceRecordFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.DifferenceRecordFinish.service.impl;
import java.util.List;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,43 +12,43 @@ import com.ruoyi.check.DifferenceRecordFinish.service.ICheckDifferenceRecordFini
/**
* 盘点差异历史Service业务层处理
*
*
* @author gw
* @date 2025-06-25
*/
@Service
public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceRecordFinishService
public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceRecordFinishService
{
@Autowired
private CheckDifferenceRecordFinishMapper checkDifferenceRecordFinishMapper;
/**
* 查询盘点差异历史
*
*
* @param checkGuid 盘点差异历史主键
* @return 盘点差异历史
*/
@Override
public CheckDifferenceRecordFinish selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid)
public CheckDifferenceRecord selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid)
{
return checkDifferenceRecordFinishMapper.selectCheckDifferenceRecordFinishByCheckGuid(checkGuid);
}
/**
* 查询盘点差异历史列表
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 盘点差异历史
*/
@Override
public List<CheckDifferenceRecordFinish> selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish)
public List<CheckDifferenceRecord> selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish)
{
return checkDifferenceRecordFinishMapper.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish);
}
/**
* 新增盘点差异历史
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 结果
*/
@@ -59,7 +61,7 @@ public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceR
/**
* 修改盘点差异历史
*
*
* @param checkDifferenceRecordFinish 盘点差异历史
* @return 结果
*/
@@ -71,7 +73,7 @@ public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceR
/**
* 批量删除盘点差异历史
*
*
* @param checkGuids 需要删除的盘点差异历史主键
* @return 结果
*/
@@ -83,7 +85,7 @@ public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceR
/**
* 删除盘点差异历史信息
*
*
* @param checkGuid 盘点差异历史主键
* @return 结果
*/