Skip to content

K
klck
Commit fe76539c authored by dongjg's avatar dongjg
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 30f26c0c c4de753a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 12280 additions and 13538 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGzReportApproveController.java deleted 100644 → 0
View file @ 30f26c0c
package com.ruoyi.web.controller.system;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysGzReportApprove;
import com.ruoyi.system.service.ISysGzReportApproveService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 审批记录Controller
*
* @author ruoyi
* @date 2021-06-15
*/
@RestController
@RequestMapping("/system/salaryapprove")
public class SysGzReportApproveController extends BaseController
{
@Autowired
private ISysGzReportApproveService sysGzReportApproveService;
/**
* 查询审批记录列表
*/
@PreAuthorize("@ss.hasPermi('system:salaryapprove:list')")
@GetMapping("/list")
public TableDataInfo list(SysGzReportApprove sysGzReportApprove)
{
startPage();
List<SysGzReportApprove> list = sysGzReportApproveService.selectSysGzReportApproveList(sysGzReportApprove);
return getDataTable(list);
}
/**
* 导出审批记录列表
*/
@PreAuthorize("@ss.hasPermi('system:salaryapprove:export')")
@Log(title = "审批记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysGzReportApprove sysGzReportApprove)
{
List<SysGzReportApprove> list = sysGzReportApproveService.selectSysGzReportApproveList(sysGzReportApprove);
ExcelUtil<SysGzReportApprove> util = new ExcelUtil<SysGzReportApprove>(SysGzReportApprove.class);
return util.exportExcel(list, "审批记录数据");
}
/**
* 获取审批记录详细信息
*/
@PreAuthorize("@ss.hasPermi('system:salaryapprove:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysGzReportApproveService.selectSysGzReportApproveById(id));
}
/**
* 新增审批记录
*/
@PreAuthorize("@ss.hasPermi('system:salaryapprove:add')")
@Log(title = "审批记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysGzReportApprove sysGzReportApprove)
{
return toAjax(sysGzReportApproveService.insertSysGzReportApprove(sysGzReportApprove));
}
/**
* 修改审批记录
*/
@PreAuthorize("@ss.hasPermi('system:salaryapprove:edit')")
@Log(title = "审批记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysGzReportApprove sysGzReportApprove)
{
return toAjax(sysGzReportApproveService.updateSysGzReportApprove(sysGzReportApprove));
}
/**
* 删除审批记录
*/
@PreAuthorize("@ss.hasPermi('system:salaryapprove:remove')")
@Log(title = "审批记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysGzReportApproveService.deleteSysGzReportApproveByIds(ids));
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGzReportInfoController.java deleted 100644 → 0
View file @ 30f26c0c
package com.ruoyi.web.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.constant.ReportStatus;
import com.ruoyi.system.domain.SysGzReport;
import com.ruoyi.system.domain.SysGzReportControl;
import com.ruoyi.system.domain.SysGzReportInfo;
import com.ruoyi.system.service.ISysGzReportControlService;
import com.ruoyi.system.service.ISysGzReportInfoService;
import com.ruoyi.system.service.ISysGzReportService;
import io.netty.util.internal.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.List;
/**
* 工资上报详情Controller
*
* @author ruoyi
* @date 2021-05-24
*/
@RestController
@RequestMapping("/system/salaryinfo")
public class SysGzReportInfoController extends BaseController
{
@Autowired
private ISysGzReportInfoService sysGzReportInfoService;
@Autowired
private ISysGzReportService sysGzReportService;
@Autowired
private ServerConfig serverConfig;
@Autowired
private ISysGzReportControlService sysGzReportControlService;
@Autowired
private TokenService tokenService;
/**
* 查询工资上报详情列表
*/
@PreAuthorize("@ss.hasPermi('system:salaryinfo:list')")
@GetMapping("/list")
public TableDataInfo list(SysGzReportInfo sysGzReportInfo)
{
startPage();
List<SysGzReportInfo> list = sysGzReportInfoService.selectSysGzReportInfoList(sysGzReportInfo);
return getDataTable(list);
}
/**
* 导出工资上报详情列表
*/
@PreAuthorize("@ss.hasPermi('system:salaryinfo:export')")
@Log(title = "工资上报详情", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysGzReportInfo sysGzReportInfo)
{
List<SysGzReportInfo> list = sysGzReportInfoService.selectSysGzReportInfoList(sysGzReportInfo);
ExcelUtil<SysGzReportInfo> util = new ExcelUtil<SysGzReportInfo>(SysGzReportInfo.class);
return util.exportExcel(list, "工资上报详情数据");
}
@Log(title = "导入数据", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:salaryinfo:import')")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, String reportCode, @RequestParam(defaultValue = "10") String reportType, boolean updateSupport) throws Exception
{
if(StringUtil.isNullOrEmpty(reportCode)){
AjaxResult.error("报送代码不能为空！");
}
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
//2. 验证 reportCode
SysGzReportControl checkControl = sysGzReportControlService.selectSysGzReportControlByCodeAndType(reportCode, reportType);
if(checkControl == null || checkControl.getStatus().equals("close")){
return AjaxResult.error("报送代码不存在或者未启用！");
}
Date thisTime = new Date();
if(checkControl.getStartdate().getTime() > thisTime.getTime() || checkControl.getEnddate().getTime() < thisTime.getTime()){
return AjaxResult.error("非报送时间内，不允许上报！");
}
//2. 根据 reportCode 去查询是否已经上传过工资表记录
SysGzReport checkReport = sysGzReportService.selectSysGzReport(reportCode, reportType, loginUser.getUser().getDeptId());
if(checkReport != null){
if(checkReport.getReportStatus().equals(ReportStatus.ApprovingSuccess)){
return AjaxResult.error("该月工资表已批准，不能重复上报！");
}
if(checkReport.getReportStatus().equals(ReportStatus.Approving)){
return AjaxResult.error("该月工资表已提交报送审批，不能重复上报！");
}
}else{
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
System.out.println("fileName:" + fileName);
System.out.println("url:" + url);
checkReport = new SysGzReport();
checkReport.setReportCode(reportCode);
checkReport.setReportType(checkControl.getReportType());
checkReport.setDeptId(loginUser.getUser().getDeptId());
checkReport.setReportStatus(ReportStatus.UnApprove);
checkReport.setFileSavePath(fileName);
checkReport.setCreateBy(loginUser.getUsername());
checkReport.setCreateTime(new Date());
sysGzReportService.insertSysGzReport(checkReport);
}
//导入 文件
ExcelUtil<SysGzReportInfo> util = new ExcelUtil<SysGzReportInfo>(SysGzReportInfo.class);
List<SysGzReportInfo> reportInfoList = util.importExcel(file.getInputStream(),0,1);
String message = sysGzReportInfoService.importInfo(reportInfoList, checkReport.getId(), checkReport.getDeptId(), loginUser.getUsername());
return AjaxResult.success(message, checkReport.getId());
}
/**
* 获取工资上报详情详细信息
*/
@PreAuthorize("@ss.hasPermi('system:salaryinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysGzReportInfoService.selectSysGzReportInfoById(id));
}
/**
* 新增工资上报详情
*/
@PreAuthorize("@ss.hasPermi('system:salaryinfo:add')")
@Log(title = "工资上报详情", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysGzReportInfo sysGzReportInfo)
{
return toAjax(sysGzReportInfoService.insertSysGzReportInfo(sysGzReportInfo));
}
/**
* 修改工资上报详情
*/
@PreAuthorize("@ss.hasPermi('system:salaryinfo:edit')")
@Log(title = "工资上报详情", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysGzReportInfo sysGzReportInfo)
{
return toAjax(sysGzReportInfoService.updateSysGzReportInfo(sysGzReportInfo));
}
/**
* 删除工资上报详情
*/
@PreAuthorize("@ss.hasPermi('system:salaryinfo:remove')")
@Log(title = "工资上报详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysGzReportInfoService.deleteSysGzReportInfoByIds(ids));
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGzReportInfoRuleController.java deleted 100644 → 0
View file @ 30f26c0c
package com.ruoyi.web.controller.system;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysGzReportInfoRule;
import com.ruoyi.system.service.ISysGzReportInfoRuleService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 工资规则验证Controller
*
* @author ruoyi
* @date 2021-07-12
*/
@RestController
@RequestMapping("/system/salaryrule")
public class SysGzReportInfoRuleController extends BaseController
{
@Autowired
private ISysGzReportInfoRuleService sysGzReportInfoRuleService;
/**
* 查询工资规则验证列表
*/
@PreAuthorize("@ss.hasPermi('system:salaryrule:list')")
@GetMapping("/list")
public TableDataInfo list(SysGzReportInfoRule sysGzReportInfoRule)
{
startPage();
List<SysGzReportInfoRule> list = sysGzReportInfoRuleService.selectSysGzReportInfoRuleList(sysGzReportInfoRule);
return getDataTable(list);
}
/**
* 导出工资规则验证列表
*/
@PreAuthorize("@ss.hasPermi('system:salaryrule:export')")
@Log(title = "工资规则验证", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysGzReportInfoRule sysGzReportInfoRule)
{
List<SysGzReportInfoRule> list = sysGzReportInfoRuleService.selectSysGzReportInfoRuleList(sysGzReportInfoRule);
ExcelUtil<SysGzReportInfoRule> util = new ExcelUtil<SysGzReportInfoRule>(SysGzReportInfoRule.class);
return util.exportExcel(list, "工资规则验证数据");
}
/**
* 获取工资规则验证详细信息
*/
@PreAuthorize("@ss.hasPermi('system:salaryrule:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysGzReportInfoRuleService.selectSysGzReportInfoRuleById(id));
}
/**
* 新增工资规则验证
*/
@PreAuthorize("@ss.hasPermi('system:salaryrule:add')")
@Log(title = "工资规则验证", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysGzReportInfoRule sysGzReportInfoRule)
{
return toAjax(sysGzReportInfoRuleService.insertSysGzReportInfoRule(sysGzReportInfoRule));
}
/**
* 修改工资规则验证
*/
@PreAuthorize("@ss.hasPermi('system:salaryrule:edit')")
@Log(title = "工资规则验证", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysGzReportInfoRule sysGzReportInfoRule)
{
return toAjax(sysGzReportInfoRuleService.updateSysGzReportInfoRule(sysGzReportInfoRule));
}
/**
* 删除工资规则验证
*/
@PreAuthorize("@ss.hasPermi('system:salaryrule:remove')")
@Log(title = "工资规则验证", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysGzReportInfoRuleService.deleteSysGzReportInfoRuleByIds(ids));
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysReportController.java deleted 100644 → 0
View file @ 30f26c0c
package com.ruoyi.web.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysGzReportCredit;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysGzReportCreditService;
import com.ruoyi.system.service.ISysGzReportService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFCell;
import static com.ruoyi.common.config.RuoYiConfig.getDownloadPath;
/**
* 报送额度限制Controller
*
* @author ruoyi
* @date 2021-06-10
*/
@RestController
@RequestMapping("/system/report")
public class SysReportController extends BaseController {
/**
* 导出报送额度限制列表
*/
@PreAuthorize("@ss.hasPermi('system:report:labourExport')")
@Log(title = "劳务工和劳务报酬", businessType = BusinessType.EXPORT)
@GetMapping("/labourExport")
public AjaxResult labourExport() {
String srcFilePath = "d:/劳务工和劳务费.xlsx";
String fileName = "劳务工和劳务费_" + System.currentTimeMillis() + ".xlsx";
String desFilePath = getDownloadPath() + fileName;
try{
exportExcel(srcFilePath, desFilePath);
} catch (Exception e)
{
e.printStackTrace();
}
AjaxResult ajax = AjaxResult.success();
ajax.put("fileName", fileName);
return ajax;
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:report:avewageExport')")
@Log(title = "劳务工和劳务报酬")
@GetMapping("/avewageExport")
public AjaxResult avewageExport() {
String srcFilePath = "d:/平均工资.xlsx";
String fileName = "平均工资_" + System.currentTimeMillis() + ".xlsx";
String desFilePath = getDownloadPath() + fileName;
try{
//创建Excel文件的输入流对象
FileInputStream fis = new FileInputStream(srcFilePath);
//根据模板创建excel工作簿
XSSFWorkbook workBook = new XSSFWorkbook(fis);
//创建Excel文件输出流对象
FileOutputStream fos = new FileOutputStream(desFilePath);
//获取创建的工作簿第一页
XSSFSheet sheet = workBook.getSheetAt(0);
//给指定的sheet命名
workBook.setSheetName(0, "2016-11-30");
workBook.write(fos);
//关闭流
fis.close();
fos.flush();
fos.close();
System.out.println("导出成功");
//exportExcel(srcFilePath, desFilePath);
} catch (Exception e)
{
e.printStackTrace();
}
AjaxResult ajax = AjaxResult.success();
ajax.put("fileName", fileName);
return ajax;
}
//根据指定的excel模板导出数据
public void exportExcel(String srcFilePath, String desFilePath) throws Exception {
//创建Excel文件的输入流对象
FileInputStream fis = new FileInputStream(srcFilePath);
//根据模板创建excel工作簿
XSSFWorkbook workBook = new XSSFWorkbook(fis);
//创建Excel文件输出流对象
FileOutputStream fos = new FileOutputStream(desFilePath);
//获取创建的工作簿第一页
XSSFSheet sheet = workBook.getSheetAt(0);
//给指定的sheet命名
workBook.setSheetName(0, "2016-11-30");
//修改标题
/* XSSFRow row = sheet.getRow(0);
XSSFCell cell = row.getCell(0);*/
//获取指定单元格值
/* String s = cell.getStringCellValue();
cell.setCellValue("修改后的标题为:" + s);*/
//获取当前sheet最后一行数据对应的行索引
/* int currentLastRowIndex = sheet.getLastRowNum();
int newRowIndex = currentLastRowIndex + 1;
XSSFRow newRow = sheet.createRow(newRowIndex);*/
//开始创建并设置该行每一单元格的信息，该行单元格的索引从 0 开始
/*int cellIndex = 0;*/
//创建一个单元格，设置其内的数据格式为字符串，并填充内容，其余单元格类同
/* XSSFCell newNameCell = newRow.createCell(cellIndex++);
newNameCell.setCellValue("乔玉宝");
XSSFCell newGenderCell = newRow.createCell(cellIndex++);
newGenderCell.setCellValue("男");
XSSFCell newAgeCell = newRow.createCell(cellIndex++ );
newAgeCell.setCellValue(25);
XSSFCell newAddressCell = newRow.createCell(cellIndex++);
newAddressCell.setCellValue("重庆市渝北区");*/
XSSFRow row = sheet.getRow(3);
XSSFRow row8 = sheet.getRow(8);
for(int i=0;i<8;i++){
XSSFCell cell = row.getCell(i);
cell.setCellValue("人数"+i);
XSSFCell cell8 = row8.getCell(i);
cell8.setCellValue("劳务费"+i);
}
workBook.write(fos);
//关闭流
fis.close();
fos.flush();
fos.close();
System.out.println("导出成功");
}
}
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java deleted 100644 → 0
View file @ 30f26c0c
package com.ruoyi.quartz.task;
import com.ruoyi.system.service.ISysGzReportEmployeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/**
* 定时任务调度测试
*
* @author ruoyi
*/
@Component("ryTask")
public class RyTask
{
@Autowired
private ISysGzReportEmployeService employeService;
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{
System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
}
public void ryParams(String params)
{
System.out.println("执行有参方法：" + params);
}
public void ryNoParams()
{
System.out.println("执行无参方法");
}
public void snapshotEmploye()
{
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
employeService.snapshotEmploye(sdf.format(calendar.getTime()));
System.out.println("花名册快照");
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
View file @ fe76539c
...@@ -15,6 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -15,6 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* 物料总分类管理Controller * 物料总分类管理Controller
...@@ -99,7 +101,7 @@ public class ActSuppliesController extends BaseController ...@@ -99,7 +101,7 @@ public class ActSuppliesController extends BaseController
public AjaxResult edit(@RequestBody ActSupplies actSupplies) public AjaxResult edit(@RequestBody ActSupplies actSupplies)
{ {
SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
actSupplies.setCreateBy(user.getUserName()); actSupplies.setUpdateBy(user.getUserName());
return toAjax(actSuppliesService.updateActSupplies(actSupplies)); return toAjax(actSuppliesService.updateActSupplies(actSupplies));
} }
...@@ -111,7 +113,8 @@ public class ActSuppliesController extends BaseController ...@@ -111,7 +113,8 @@ public class ActSuppliesController extends BaseController
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
{ {
List<Integer> find = actSuppliesService.findall();
List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
System.out.println(find.toString()); System.out.println(find.toString());
for (long num : ids){ for (long num : ids){
if (find.contains((int)num)){ if (find.contains((int)num)){
...@@ -121,4 +124,30 @@ public class ActSuppliesController extends BaseController ...@@ -121,4 +124,30 @@ public class ActSuppliesController extends BaseController
return toAjax(actSuppliesService.deleteActSuppliesByIds(ids)); return toAjax(actSuppliesService.deleteActSuppliesByIds(ids));
} }
/**
* 启用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:enable')")
@GetMapping("/enable/{id}")
public AjaxResult setEnable(@PathVariable("id") Long id)
{
System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesService.setEnable(id);
return AjaxResult.success();
}
/**
* 禁用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:Disable')")
@GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id)
{
System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesService.setDisable(id);
return AjaxResult.success();
}
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java
View file @ fe76539c
...@@ -103,7 +103,7 @@ public class ActSuppliesDetailsController extends BaseController ...@@ -103,7 +103,7 @@ public class ActSuppliesDetailsController extends BaseController
public AjaxResult edit(@RequestBody ActSuppliesDetails actSuppliesDetails) public AjaxResult edit(@RequestBody ActSuppliesDetails actSuppliesDetails)
{ {
SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesDetails.setCreateBy(user.getUserName()); actSuppliesDetails.setUpdateBy(user.getUserName());
return toAjax(actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails)); return toAjax(actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails));
} }
...@@ -126,4 +126,29 @@ public class ActSuppliesDetailsController extends BaseController ...@@ -126,4 +126,29 @@ public class ActSuppliesDetailsController extends BaseController
return toAjax(actSuppliesDetailsService.deleteActSuppliesDetailsByIds(ids)); return toAjax(actSuppliesDetailsService.deleteActSuppliesDetailsByIds(ids));
} }
/**
* 启用物料细分类管理
*/
@PreAuthorize("@ss.hasPermi('ActSuppliesDetails:ActSuppliesDetails:enable')")
@GetMapping("/enable/{id}")
public AjaxResult setEnable(@PathVariable("id") Long id)
{
System.out.println("开始处理【启用物料细分类管理】的请求，参数：{}"+ id);
actSuppliesDetailsService.setEnable(id);
return AjaxResult.success();
}
/**
* 禁用物料细分类管理
*/
@PreAuthorize("@ss.hasPermi('ActSuppliesDetails:ActSuppliesDetails:Disable')")
@GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id)
{
System.out.println("开始处理【禁用物料细分类管理】的请求，参数：{}"+ id);
actSuppliesDetailsService.setDisable(id);
return AjaxResult.success();
}
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java
View file @ fe76539c
...@@ -114,6 +114,39 @@ public class ActSuppliesRoleController extends BaseController ...@@ -114,6 +114,39 @@ public class ActSuppliesRoleController extends BaseController
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids) public AjaxResult remove(@PathVariable Integer[] ids)
{ {
List<Integer> find = actSuppliesRoleService.findall();
for (long num : ids){
if (find.contains((int)num)){
return AjaxResult.success("删除失败","操作失败");
}
}
return toAjax(actSuppliesRoleService.deleteActSuppliesRoleByIds(ids)); return toAjax(actSuppliesRoleService.deleteActSuppliesRoleByIds(ids));
} }
/**
* 启用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('system:suppliesrole:enable')")
@GetMapping("/enable/{id}")
public AjaxResult setEnable(@PathVariable("id") Long id)
{
System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesRoleService.setEnable(id);
return AjaxResult.success();
}
/**
* 禁用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('system:suppliesrole:Disable')")
@GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id)
{
System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesRoleService.setDisable(id);
return AjaxResult.success();
}
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java
View file @ fe76539c
...@@ -2,6 +2,7 @@ package com.ruoyi.system.controller; ...@@ -2,6 +2,7 @@ package com.ruoyi.system.controller;
import java.util.List; import java.util.List;
import com.ruoyi.system.domain.ActSupplies; import com.ruoyi.system.domain.ActSupplies;
import com.ruoyi.system.domain.ActSuppliesRole; import com.ruoyi.system.domain.ActSuppliesRole;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -44,6 +45,20 @@ public class ActSuppliesRoleDetailController extends BaseController ...@@ -44,6 +45,20 @@ public class ActSuppliesRoleDetailController extends BaseController
} }
// /**
// * 查询运算方法
// * */
// @PreAuthorize("@ss.hasPermi('system:suppliesroledetail:saveOperation')")
// @GetMapping("/saveOperation")
// @ResponseBody
// public TableDataInfo saveOperation(){
//
// List<ActOperation> options = actSuppliesRoleDetailService.saveOperation();
//
// return getDataTable(options);
//
// }
/** /**
* 查询规则详情列表 * 查询规则详情列表
*/ */
...@@ -111,4 +126,29 @@ public class ActSuppliesRoleDetailController extends BaseController ...@@ -111,4 +126,29 @@ public class ActSuppliesRoleDetailController extends BaseController
{ {
return toAjax(actSuppliesRoleDetailService.deleteActSuppliesRoleDetailByIds(ids)); return toAjax(actSuppliesRoleDetailService.deleteActSuppliesRoleDetailByIds(ids));
} }
/**
* 启用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('system:suppliesroledetail:enable')")
@GetMapping("/enable/{id}")
public AjaxResult setEnable(@PathVariable("id") Long id)
{
System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesRoleDetailService.setEnable(id);
return AjaxResult.success();
}
/**
* 禁用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('system:suppliesroledetail:Disable')")
@GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id)
{
System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesRoleDetailService.setDisable(id);
return AjaxResult.success();
}
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesTemplateController.java
View file @ fe76539c
...@@ -74,7 +74,7 @@ public class ActSuppliesTemplateController extends BaseController { ...@@ -74,7 +74,7 @@ public class ActSuppliesTemplateController extends BaseController {
} }
/** /**
* *获取excel模板内容
*/ */
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listId')") @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listId')")
@GetMapping("/listId/{id}") @GetMapping("/listId/{id}")
...@@ -104,6 +104,56 @@ public class ActSuppliesTemplateController extends BaseController { ...@@ -104,6 +104,56 @@ public class ActSuppliesTemplateController extends BaseController {
@Log(title = "Excel模板", businessType = BusinessType.DELETE) @Log(title = "Excel模板", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {
List<Integer> find = actSuppliesTemplateService.findall();
for (long num : ids){
if (find.contains((int)num)){
return AjaxResult.success("删除失败","操作失败");
}
}
return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids)); return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
} }
/**
* 判断模板名称是否重复
*/
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:ifName')")
@GetMapping("/ifName/{name}")
public AjaxResult setEnable(@PathVariable("name") String name)
{
List<String> find = actSuppliesTemplateService.findName();
if (find.contains(name)){
return AjaxResult.success("验证失败","存在重复");
}
return AjaxResult.success("验证通过","验证通过");
}
/**
* 启用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:enable')")
@GetMapping("/enable/{id}")
public AjaxResult setEnable(@PathVariable("id") Long id)
{
System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesTemplateService.setEnable(id);
return AjaxResult.success();
}
/**
* 禁用物料总分类管理
*/
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:Disable')")
@GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id)
{
System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesTemplateService.setDisable(id);
return AjaxResult.success();
}
} }
\ No newline at end of file
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActOperation.java 0 → 100644
View file @ fe76539c
package com.ruoyi.system.domain;
import com.ruoyi.common.core.domain.BaseEntity;
public class ActOperation extends BaseEntity {
private static final long serialVersionUID = 1L;
private Integer id;
private String OperationName;
private Integer status;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getOperationName() {
return OperationName;
}
public void setOperationName(String operationName) {
OperationName = operationName;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java
View file @ fe76539c
...@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; ...@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
/** /**
* 物料总分类管理对象 act_supplies * 用友物料管理对象 act_supplies
* *
* @author ruoyi * @author ruoyi
* @date 2023-07-11 * @date 2023-07-11
...@@ -19,9 +19,9 @@ public class ActSupplies extends BaseEntity ...@@ -19,9 +19,9 @@ public class ActSupplies extends BaseEntity
private Long id; private Long id;
/** 父ID */ /** 父ID */
@Excel(name = "父ID")
private Long pid; private Long pid;
@Excel(name = "上级分类")
private String fname; private String fname;
/** 物料名称 */ /** 物料名称 */
...@@ -29,12 +29,13 @@ public class ActSupplies extends BaseEntity ...@@ -29,12 +29,13 @@ public class ActSupplies extends BaseEntity
private String suppliesName; private String suppliesName;
/** 显示排序 */ /** 显示排序 */
@Excel(name = "显示排序")
private Long orderNum; private Long orderNum;
/** 状态 */ /** 状态 */
@Excel(name = "状态") @Excel(name = "状态")
private Long status; private Integer status;
public String getFname() { public String getFname() {
return fname; return fname;
...@@ -80,12 +81,12 @@ public class ActSupplies extends BaseEntity ...@@ -80,12 +81,12 @@ public class ActSupplies extends BaseEntity
{ {
return orderNum; return orderNum;
} }
public void setStatus(Long status)
{ public void setStatus(Integer status) {
this.status = status; this.status = status;
} }
public Long getStatus() public Integer getStatus()
{ {
return status; return status;
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesDetails.java
View file @ fe76539c
...@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; ...@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
/** /**
* 物料细分类管理对象 act_supplies_details * 六矿物料管理对象 act_supplies_details
* *
* @author ruoyi * @author ruoyi
* @date 2023-07-11 * @date 2023-07-11
...@@ -19,14 +19,22 @@ public class ActSuppliesDetails extends BaseEntity ...@@ -19,14 +19,22 @@ public class ActSuppliesDetails extends BaseEntity
private Long id; private Long id;
/** 父ID */ /** 父ID */
@Excel(name = "父ID")
private Long sid; private Long sid;
@Excel(name = "上级分类")
private String fname;
/** 物料名称 */ /** 物料名称 */
@Excel(name = "物料名称") @Excel(name = "物料名称")
private String detailsName; private String detailsName;
private String fname; /** 所属系统 */
@Excel(name = "所属系统")
private String sysclassify;
/** 状态 */
@Excel(name = "状态")
private Integer status;
public String getFname() { public String getFname() {
return fname; return fname;
...@@ -36,14 +44,6 @@ public class ActSuppliesDetails extends BaseEntity ...@@ -36,14 +44,6 @@ public class ActSuppliesDetails extends BaseEntity
this.fname = fname; this.fname = fname;
} }
/** 所属系统 */
@Excel(name = "所属系统")
private String sysclassify;
/** 状态 */
@Excel(name = "状态")
private Long status;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
...@@ -80,12 +80,12 @@ public class ActSuppliesDetails extends BaseEntity ...@@ -80,12 +80,12 @@ public class ActSuppliesDetails extends BaseEntity
{ {
return sysclassify; return sysclassify;
} }
public void setStatus(Long status) public void setStatus(Integer status)
{ {
this.status = status; this.status = status;
} }
public Long getStatus() public Integer getStatus()
{ {
return status; return status;
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRole.java
View file @ fe76539c
...@@ -16,12 +16,15 @@ public class ActSuppliesRole extends BaseEntity ...@@ -16,12 +16,15 @@ public class ActSuppliesRole extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** ID */ /** ID */
private Integer id; private Long id;
/** 模板ID */ /** 模板ID */
@Excel(name = "模板ID")
private Integer tempId; private Integer tempId;
/**所属模板*/
@Excel(name = "所属模板")
private String templateName;
/** 规则名称 */ /** 规则名称 */
@Excel(name = "规则名称") @Excel(name = "规则名称")
private String roleName; private String roleName;
...@@ -30,12 +33,22 @@ public class ActSuppliesRole extends BaseEntity ...@@ -30,12 +33,22 @@ public class ActSuppliesRole extends BaseEntity
@Excel(name = "状态") @Excel(name = "状态")
private Integer status; private Integer status;
public void setId(Integer id)
public String getTemplateName() {
return templateName;
}
public void setTemplateName(String templateName) {
this.templateName = templateName;
}
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Integer getId() public Long getId()
{ {
return id; return id;
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java
View file @ fe76539c
...@@ -16,10 +16,9 @@ public class ActSuppliesRoleDetail extends BaseEntity ...@@ -16,10 +16,9 @@ public class ActSuppliesRoleDetail extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 规则详情ID */ /** 规则详情ID */
private Integer id; private Long id;
/** 导入规则ID */ /** 导入规则ID */
@Excel(name = "导入规则ID")
private Integer roleId; private Integer roleId;
/** 规则名称 */ /** 规则名称 */
...@@ -31,18 +30,49 @@ public class ActSuppliesRoleDetail extends BaseEntity ...@@ -31,18 +30,49 @@ public class ActSuppliesRoleDetail extends BaseEntity
private String detailML; private String detailML;
private String detailYH; private String detailYH;
private String detailYL; private String detailYL;
private String detailYS;
/**所属规则*/
@Excel(name = "所属规则")
private String roleName;
private Integer detaId;
/** 规则内容 */ /** 规则内容 */
@Excel(name = "规则内容") @Excel(name = "规则内容")
private String detailContent; private String detailContent;
/**是否物料转换*/ /**运算规则*/
@Excel(name = "运算规则")
private Integer convertStatus; private Integer convertStatus;
/** 状态 */ /** 状态 */
@Excel(name = "状态") @Excel(name = "状态")
private Integer status; private Integer status;
public String getRoleName() {
return roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
public Integer getDetaId() {
return detaId;
}
public void setDetaId(Integer detaId) {
this.detaId = detaId;
}
public String getDetailYS() {
return detailYS;
}
public void setDetailYS(String detailYS) {
this.detailYS = detailYS;
}
public Integer getConvertStatus() { public Integer getConvertStatus() {
return convertStatus; return convertStatus;
} }
...@@ -83,12 +113,12 @@ public class ActSuppliesRoleDetail extends BaseEntity ...@@ -83,12 +113,12 @@ public class ActSuppliesRoleDetail extends BaseEntity
this.detailYL = detailYL; this.detailYL = detailYL;
} }
public void setId(Integer id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Integer getId() public Long getId()
{ {
return id; return id;
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java
View file @ fe76539c
...@@ -40,7 +40,7 @@ public class ActSuppliesTemplate extends BaseEntity ...@@ -40,7 +40,7 @@ public class ActSuppliesTemplate extends BaseEntity
/** 状态 */ /** 状态 */
@Excel(name = "状态") @Excel(name = "状态")
private Long status; private Integer status;
public void setId(Long id) public void setId(Long id)
{ {
...@@ -69,12 +69,12 @@ public class ActSuppliesTemplate extends BaseEntity ...@@ -69,12 +69,12 @@ public class ActSuppliesTemplate extends BaseEntity
this.templateContent = templateContent; this.templateContent = templateContent;
} }
public void setStatus(Long status) public void setStatus(Integer status)
{ {
this.status = status; this.status = status;
} }
public Long getStatus() public Integer getStatus()
{ {
return status; return status;
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleMapper.java
View file @ fe76539c
...@@ -62,4 +62,5 @@ public interface ActSuppliesRoleMapper ...@@ -62,4 +62,5 @@ public interface ActSuppliesRoleMapper
List<ActSuppliesTemplate> saveSid(); List<ActSuppliesTemplate> saveSid();
List<Integer> findall();
} }
ruoyi-ui/package.json
View file @ fe76539c
This diff is collapsed.
ruoyi-ui/public/index.html
View file @ fe76539c
This diff is collapsed.
ruoyi-ui/public/luckysheet/plugins/js/jquery.min.js 0 → 100644
View file @ fe76539c
This diff is collapsed.
ruoyi-ui/src/api/Actsupplies/Actsupplies.js
View file @ fe76539c
This diff is collapsed.
ruoyi-ui/src/api/system/suppliesrole.js
View file @ fe76539c
This diff is collapsed.
ruoyi-ui/src/main.js
View file @ fe76539c
This diff is collapsed.
ruoyi-ui/vue.config.js
View file @ fe76539c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment