Skip to content

K
klck
Commit da10fcf4 authored by lenovo's avatar lenovo
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 76729476 71096709
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1010 additions and 993 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View file @ da10fcf4
......@@ -48,7 +48,7 @@ public class CommonController
{
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
}
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
String realFileName = fileName.substring(fileName.indexOf("_") + 1);
System.out.println(realFileName);
String filePath = RuoYiConfig.getDownloadPath() + fileName;
System.out.println(filePath);
......
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
View file @ da10fcf4
......@@ -44,7 +44,6 @@ public class ActSuppliesController extends BaseController
}
/**
* 查询物料总分类管理列表
*/
......@@ -70,7 +69,6 @@ public class ActSuppliesController extends BaseController
}
/**
* 导出物料总分类管理列表
*/
......@@ -79,9 +77,19 @@ public class ActSuppliesController extends BaseController
@GetMapping("/export")
public AjaxResult export(ActSupplies actSupplies)
{
List<ActSupplies> list = actSuppliesService.selectActSuppliesList(actSupplies);
for (ActSupplies s : list) {
String ss = s.getStatus();
if("0".equals(ss)){
s.setStatus("启用");
}else {
s.setStatus("禁用");
}
}
ExcelUtil<ActSupplies> util = new ExcelUtil<ActSupplies>(ActSupplies.class);
return util.exportExcel(list, "物料总分类管理数据");
return util.exportExcel(list, "用友物料");
}
/**
......@@ -119,7 +127,7 @@ public class ActSuppliesController extends BaseController
actSupplies.setCreateBy(user.getUserName());
/*return toAjax(actSuppliesService.insertActSupplies(actSupplies));*/
int i = actSuppliesService.insertActSupplies(actSupplies);
if(i==0){
if(i == 0){
return AjaxResult.error("添加名称失败，名称已被占用");
}
return AjaxResult.success("添加成功");
......@@ -148,7 +156,7 @@ public class ActSuppliesController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:remove')")
@Log(title = "物料总分类管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
......
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java
View file @ da10fcf4
......@@ -67,7 +67,7 @@ public class ActSuppliesDetailsController extends BaseController
{
List<ActSuppliesDetails> list = actSuppliesDetailsService.selectActSuppliesDetailsList(actSuppliesDetails);
ExcelUtil<ActSuppliesDetails> util = new ExcelUtil<ActSuppliesDetails>(ActSuppliesDetails.class);
return util.exportExcel(list, "物料细分类管理数据");
return util.exportExcel(list, "六矿物料");
}
/**
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java
View file @ da10fcf4
......@@ -21,7 +21,7 @@ public class ActSupplies extends BaseEntity
/** 父ID */
private Long pid;
@Excel(name = "上级分类")
@Excel(name = "大类名称")
private String fname;
/** 物料名称 */
......@@ -33,7 +33,7 @@ public class ActSupplies extends BaseEntity
/** 状态 */
@Excel(name = "状态")
private Integer status;
private String status;
......@@ -82,11 +82,11 @@ public class ActSupplies extends BaseEntity
return orderNum;
}
public void setStatus(Integer status) {
public void setStatus(String status) {
this.status = status;
}
public Integer getStatus()
public String getStatus()
{
return status;
}
......
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java
View file @ da10fcf4
......@@ -137,12 +137,12 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
@Override
public void setEnable(Long id) {
updateStatusById(id,0);
updateStatusById(id,"0");
}
@Override
public void setDisable(Long id) {
updateStatusById(id,1);
updateStatusById(id,"1");
}
@Override
......@@ -166,21 +166,22 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
return actSuppliesMapper.selectActSuppliesListOne(actSupplies);
}
private void updateStatusById(Long id, Integer status){
private void updateStatusById(Long id, String status){
String[] statusText={"禁用","启用"};
//判断查询结果是否为空
ActSupplies queryResult = actSuppliesMapper.selectActSuppliesById(id);
if(queryResult ==null) {
String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
String message =statusText[Integer.parseInt(status)] + "物料总分类管理失败，尝试访问的数据不存在";
System.out.println(message);
throw new RuntimeException(message);
}
//判断以上查询结果中的status是否与参数status相同
if(queryResult.getStatus().equals(status)){
String message = statusText[status] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[status] + "状态！";
String message = statusText[Integer.parseInt(status)] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[Integer.parseInt(status)] + "状态！";
System.out.println(message);
throw new RuntimeException(message);
}
......@@ -192,7 +193,7 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
int rows = actSuppliesMapper.updateActSupplies(actSupplies);
if (rows != 1) {
String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
String message = statusText[Integer.parseInt(status)] + "物料总分类管理失败，服务器忙请再次重试";
System.out.println(message);
throw new RuntimeException(message);
}
......
ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
View file @ da10fcf4
......@@ -20,6 +20,7 @@
clearable
size="small"
@keyup.enter.native="handleQuery"
maxlength="15"
/>
</el-form-item>
<el-form-item label="所属系统" prop="sysclassify">
......@@ -29,6 +30,7 @@
clearable
size="small"
@keyup.enter.native="handleQuery"
maxlength="15"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
......@@ -149,7 +151,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属分类" prop="sid">
<el-select v-model="form.sid" filterable placeholder="请选择所属分类" >
<el-select v-model="form.sid" filterable placeholder="请选择所属分类" style="width:380px" >
<el-option
v-for="option in options2"
:key="option.suppliesName"
......@@ -159,13 +161,13 @@
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="detailsName">
<el-input v-model="form.detailsName" placeholder="请输入物料名称" />
<el-input v-model="form.detailsName" placeholder="请输入物料名称" maxlength="15"/>
</el-form-item>
<el-form-item label="所属系统" prop="sysclassify">
<el-input v-model="form.sysclassify" placeholder="请输入所属系统" />
<el-input v-model="form.sysclassify" placeholder="请输入所属系统" maxlength="15"/>
</el-form-item>
<el-form-item label="状态" prop="">
<el-select v-model="form.status" placeholder="请选择状态">
<el-form-item label="状态" prop="status" >
<el-select v-model="form.status" placeholder="请选择状态" style="width:380px">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
......
ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue
View file @ da10fcf4
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="一级分类名称" prop="pid" label-width="100px">-->
<!-- <el-select v-model="queryParams.pid" filterable clearable placeholder="请输入一级分类分类名称">-->
<!-- <el-option-->
<!-- v-for="option in options"-->
<!-- :key="option.suppliesName"-->
<!-- :label="option.suppliesName"-->
<!-- :value="option.id"-->
<!-- ></el-option>-->
<!-- <el-option label="无" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="一级分类名称" prop="pid" label-width="100px">-->
<!-- <el-select v-model="queryParams.pid" filterable clearable placeholder="请输入一级分类分类名称">-->
<!-- <el-option-->
<!-- v-for="option in options"-->
<!-- :key="option.suppliesName"-->
<!-- :label="option.suppliesName"-->
<!-- :value="option.id"-->
<!-- ></el-option>-->
<!-- <el-option label="无" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="一级分类名称" prop="suppliesName" label-width="100px">
<el-input
v-model="queryParams.suppliesName"
......@@ -127,8 +127,8 @@
<!-- 添加或修改物料总分类管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="一级分类名称" prop="suppliesName">
<el-input v-model="form.suppliesName" placeholder="请输入一级分类名称" />
<el-form-item label="一级分类名称" prop="suppliesName" >
<el-input v-model="form.suppliesName" placeholder="请输入一级分类名称" maxlength="15"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
......
ruoyi-ui/src/views/system/supplies/index.vue
View file @ da10fcf4
......@@ -357,6 +357,7 @@ export default {
break;
case 6:
{
let cost=['安全费用','国债费用','办公费用','其它费用','原煤基本生产','洗煤费用','制造费用','其他业务成本'];
let department=['二掘区','后勤服务二科','后勤服务一科','机电科','井运区','救护队','开拓区','开运区','通风区','通讯管理科','物资管理科','巷修区','一掘区','准备区','综二区','综一区','钻探区'];
//加个费用循环
for(let j=0;j<department.length;j++){
......
ruoyi-ui/src/views/system/supplies/index_template.vue
View file @ da10fcf4
......@@ -7,6 +7,7 @@
placeholder="请输入模板名称"
clearable
@keyup.enter.native="handleQuery"
maxlength="15"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
......
ruoyi-ui/src/views/system/suppliesrole/index.vue
View file @ da10fcf4
......@@ -26,6 +26,7 @@
clearable
size="small"
@keyup.enter.native="handleQuery"
maxlength="15"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
......@@ -137,7 +138,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属模板" prop="tempId">
<el-select v-model="form.tempId" filterable placeholder="请选择关联项" >
<el-select v-model="form.tempId" filterable placeholder="请选择关联项" style="width:380px" >
<el-option
v-for="option in options"
:key="option.templateName"
......@@ -147,10 +148,10 @@
</el-select>
</el-form-item>
<el-form-item label="规则名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入规则名称" />
<el-input v-model="form.roleName" placeholder="请输入规则名称" maxlength="15"/>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="form.status">
<el-select v-model="form.status" style="width:380px">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
......
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