Commit 4c6551d1 authored by lenovo's avatar lenovo

物资模板添加发布功能

parent 419e0924
......@@ -97,6 +97,37 @@ public class ActSuppliesTemplateController extends BaseController {
return toAjax(actSuppliesTemplateService.updateSuppliesTemplate(sysSupplies));
}
/**
* 发布Excel模板
*/
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:releaseStatus')")
@Log(title = "Excel模板", businessType = BusinessType.UPDATE)
@GetMapping("/releaseStatus/{ids}")
public AjaxResult releaseStatus(@PathVariable Long[] ids) {
return toAjax(actSuppliesTemplateService.releaseStatus(ids));
}
/**
* 下架Excel模板
*/
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:offShelfStatus')")
@Log(title = "Excel模板", businessType = BusinessType.UPDATE)
@GetMapping("/offShelfStatus/{ids}")
public AjaxResult offShelfStatus(@PathVariable Long[] ids) {
return toAjax(actSuppliesTemplateService.offShelfStatus(ids));
}
/**
* 下架Excel模板
*/
@PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:copyTemplate')")
@Log(title = "Excel模板", businessType = BusinessType.UPDATE)
@GetMapping("/copyTemplate/{id}")
public AjaxResult copyTemplate(@PathVariable Long id) {
String name = actSuppliesTemplateService.copyTemplate(id);
return AjaxResult.success("200",name);
}
/**
* 删除Excel模板
*/
......@@ -107,9 +138,9 @@ public class ActSuppliesTemplateController extends BaseController {
if (actSuppliesTemplateService.findall(ids).size()>0){
return AjaxResult.error("该模板下存在关联规则,请先删除关联规则!!!","操作失败");
}
// if (actSuppliesTemplateService.findall(ids).size()>0){
// return AjaxResult.error("该模板下存在关联规则,请先删除关联规则!!!","操作失败");
// }
return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
}
......@@ -149,9 +180,9 @@ public class ActSuppliesTemplateController extends BaseController {
@GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id)
{
if(actSuppliesTemplateService.find(id).size()>0){
return AjaxResult.success("该物料下存在关联物料,请先删除关联物料!!!","操作失败");
}
// if(actSuppliesTemplateService.find(id).size()>0){
// return AjaxResult.success("该物料下存在关联物料,请先删除关联物料!!!","操作失败");
// }
System.out.println("开始处理【禁用物料总分类管理】的请求,参数:{}"+ id);
actSuppliesTemplateService.setDisable(id);
return AjaxResult.success();
......
......@@ -17,6 +17,8 @@ public interface ActSuppliesTemplateMapper
List<ActSuppliesTemplate> selectSuppliesTemplateById(Long id);
List<ActSuppliesTemplate> selectSuppliesTemplateByIdNoId(Long id);
int insertSuppliesTemplate(ActSuppliesTemplate sysSupplies);
// List<ActSuppliesTemplate> selectlistnameid();
......@@ -25,6 +27,8 @@ public interface ActSuppliesTemplateMapper
int deleteSuppliesTemplateByIds(Long[] ids);
int updateSuppliesTemplateByIds(Long[] ids);
List<ActSuppliesTemplate> saveTemplate(Long id);
List<Integer> findall(Long[] ids);
......@@ -33,4 +37,7 @@ public interface ActSuppliesTemplateMapper
List<String> findName();
List<ActSuppliesTemplate> saveTemplateStatus(Long[] ids);
int selectHistory(Long id);
}
......@@ -46,5 +46,9 @@ public interface ActSuppliesTemplateService
List<String> findName();
int releaseStatus(Long[] ids);
int offShelfStatus(Long[] ids);
String copyTemplate(Long id);
}
......@@ -3,13 +3,13 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.ActSupplies;
import com.ruoyi.system.domain.ActSuppliesTemplate;
import com.ruoyi.system.mapper.ActSuppliesTemplateMapper;
import com.ruoyi.system.service.ActSuppliesTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.LinkedList;
import java.util.List;
/**
......@@ -58,7 +58,37 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
@Override
public int deleteSuppliesTemplateByIds(Long[] ids) {
return actSuppliesTemplateMapper.deleteSuppliesTemplateByIds(ids);
List<ActSuppliesTemplate> actSuppliesTemplate = actSuppliesTemplateMapper.saveTemplateStatus(ids);
List<Long> idsd = new LinkedList<>();
List<Long> idsu = new LinkedList<>();
for (int i=0;i<actSuppliesTemplate.size();i++) {
if (actSuppliesTemplate.get(i).getStatus()==1) {
idsd.add(actSuppliesTemplate.get(i).getId());
} else {
int count = actSuppliesTemplateMapper.selectHistory(actSuppliesTemplate.get(i).getId());
if(count>0){
idsu.add(actSuppliesTemplate.get(i).getId());
}else {
idsd.add(actSuppliesTemplate.get(i).getId());
}
}
}
if (idsd.size()>0){
actSuppliesTemplateMapper.deleteSuppliesTemplateByIds(idsd.toArray(idsd.toArray(new Long[0])));
}else if (idsu.size()>0){
actSuppliesTemplateMapper.updateSuppliesTemplateByIds(idsu.toArray(idsu.toArray(new Long[0])));
}
return 1;
}
@Override
......@@ -91,6 +121,69 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
return actSuppliesTemplateMapper.findName();
}
@Override
public int releaseStatus(Long[] ids) {
List<ActSuppliesTemplate> actSuppliesTemplate = actSuppliesTemplateMapper.saveTemplateStatus(ids);
for (int i =0;i<actSuppliesTemplate.size();i++) {
SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesTemplate.get(i).setUpdateBy(user.getUserName());
actSuppliesTemplate.get(i).setUpdateTime(DateUtils.getNowDate());
if (actSuppliesTemplate.get(i).getStatus() > 0){
actSuppliesTemplate.get(i).setStatus(0);
actSuppliesTemplateMapper.updateSuppliesTemplate(actSuppliesTemplate.get(i));
}
}
return 1;
}
@Override
public int offShelfStatus(Long[] ids) {
List<ActSuppliesTemplate> actSuppliesTemplate = actSuppliesTemplateMapper.saveTemplateStatus(ids);
for (int i =0;i<actSuppliesTemplate.size();i++){
SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesTemplate.get(i).setUpdateBy(user.getUserName());
actSuppliesTemplate.get(i).setUpdateTime(DateUtils.getNowDate());
if (actSuppliesTemplate.get(i).getStatus() ==0){
int count = actSuppliesTemplateMapper.selectHistory(actSuppliesTemplate.get(i).getId());
if (count == 0){
actSuppliesTemplate.get(i).setStatus(1);
actSuppliesTemplateMapper.updateSuppliesTemplate(actSuppliesTemplate.get(i));
}else {
actSuppliesTemplate.get(i).setStatus(2);
actSuppliesTemplateMapper.updateSuppliesTemplate(actSuppliesTemplate.get(i));
}
}
}
return 1;
}
@Override
public String copyTemplate(Long id) {
List<ActSuppliesTemplate> actSuppliesTemplates = actSuppliesTemplateMapper.selectSuppliesTemplateByIdNoId(id);
actSuppliesTemplates.get(0).setStatus(1);
SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesTemplates.get(0).setCreateBy(user.getCreateBy());
actSuppliesTemplates.get(0).setCreateTime(DateUtils.getNowDate());
actSuppliesTemplateMapper.insertSuppliesTemplate(actSuppliesTemplates.get(0));
return actSuppliesTemplates.get(0).getTemplateName();
}
private void updateStatusById(Long id, Integer status){
String[] statusText={"禁用","启用"};
......
......@@ -51,11 +51,19 @@
where id = #{id}
</select>
<select id="saveTemplate" parameterType="Long" resultMap="SuppliesTemplateResult">
<select id="selectSuppliesTemplateByIdNoId" parameterType="Long" resultMap="SuppliesTemplateResult">
<include refid="selectSuppliesTemplateVo"/>
where id = #{id}
</select>
<select id="saveTemplate" parameterType="Long" resultMap="SuppliesTemplateResult">
select det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template where id = #{id}
</select>
<select id="selectHistory" parameterType="Long" resultType="Integer">
SELECT COUNT(template_id) FROM act_supplies_historydata where template_id = #{id}
</select>
<insert id="insertSuppliesTemplate" parameterType="ActSuppliesTemplate" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_template
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -105,5 +113,19 @@
#{id}
</foreach>
</delete>
<update id="updateSuppliesTemplateByIds" parameterType="String">
update act_supplies_template set status = 2 where id in
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="saveTemplateStatus" parameterType="String" resultMap="SuppliesTemplateResult">
select id,status from act_supplies_template where id in
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
</mapper>
import request from '@/utils/request'
import LuckyExcel from "luckyexcel";
//小物料转大物料
......@@ -55,6 +56,27 @@ export function updateSuppliesTemplate(data) {
})
}
export function releaseTemplateStatus(id){
return request({
url: '/SuppliesTemplate/SuppliesTemplate/releaseStatus/' + id,
method: 'get'
})
}
export function offShelfTemplateStatus(id){
return request({
url: '/SuppliesTemplate/SuppliesTemplate/offShelfStatus/' + id,
method: 'get'
})
}
export function CopyTemplate(id){
return request({
url: '/SuppliesTemplate/SuppliesTemplate/copyTemplate/' + id,
method: 'get'
})
}
// 删除Excel模板
export function delSuppliesTemplate(id) {
return request({
......
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