Browse Source

领料单(原料/辅料/半成品)、上线支持日志(48、49、55、56、73)

erp、
ling li 1 year ago
parent
commit
5d25829911
  1. 28
      log.path_IS_UNDEFINED/sys-user.log
  2. 123
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java
  3. 159
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java
  4. 61
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java
  5. 61
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java
  6. 94
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java
  7. 87
      ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml
  8. 55
      ruoyi-admin/src/main/resources/templates/system/processCategory/add.html
  9. 56
      ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html
  10. 119
      ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
  11. BIN
      ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysCaptchaController.class
  12. 3
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

28
log.path_IS_UNDEFINED/sys-user.log

@ -71,3 +71,31 @@
05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== 05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== 05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:44:26.717 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] 05:44:26.717 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
08:57:36.005 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
08:57:36.006 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
09:00:20.969 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
09:12:56.214 [Thread-41] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
09:12:56.215 [Thread-41] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
09:12:56.215 [Thread-41] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:16:20.725 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:22:53.487 [Thread-53] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:22:53.489 [Thread-53] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:22:53.489 [Thread-53] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:23:32.235 [Thread-66] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:23:32.235 [Thread-66] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:23:32.236 [Thread-66] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:23:53.222 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:24:44.592 [Thread-79] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:24:44.594 [Thread-79] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:24:44.595 [Thread-79] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:25:54.763 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:26:53.300 [Thread-92] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:26:53.301 [Thread-92] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:26:53.302 [Thread-92] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:27:32.463 [Thread-108] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:27:32.465 [Thread-108] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:28:16.714 [schedule-pool-1] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:33:38.243 [Thread-121] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:33:38.246 [Thread-121] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:33:38.246 [Thread-121] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:35:12.185 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]

123
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java

@ -0,0 +1,123 @@
package com.ruoyi.system.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysProcessCategory;
import com.ruoyi.system.service.ISysProcessCategoryService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 制程类别明细Controller
*
* @author ruoyi
* @date 2023-05-22
*/
@Controller
@RequestMapping("/system/processCategory")
public class SysProcessCategoryController extends BaseController
{
private String prefix = "system/processCategory";
@Autowired
private ISysProcessCategoryService sysProcessCategoryService;
@RequiresPermissions("system:processCategory:view")
@GetMapping()
public String processCategory()
{
return prefix + "/processCategory";
}
/**
* 查询制程类别明细列表
*/
@RequiresPermissions("system:processCategory:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(SysProcessCategory sysProcessCategory)
{
startPage();
List<SysProcessCategory> list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory);
return getDataTable(list);
}
/**
* 导出制程类别明细列表
*/
@RequiresPermissions("system:processCategory:export")
@Log(title = "制程类别明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(SysProcessCategory sysProcessCategory)
{
List<SysProcessCategory> list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory);
ExcelUtil<SysProcessCategory> util = new ExcelUtil<SysProcessCategory>(SysProcessCategory.class);
return util.exportExcel(list, "制程类别明细数据");
}
/**
* 新增制程类别明细
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存制程类别明细
*/
@RequiresPermissions("system:processCategory:add")
@Log(title = "制程类别明细", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(SysProcessCategory sysProcessCategory)
{
return toAjax(sysProcessCategoryService.insertSysProcessCategory(sysProcessCategory));
}
/**
* 修改制程类别明细
*/
@GetMapping("/edit/{processCategoryId}")
public String edit(@PathVariable("processCategoryId") Long processCategoryId, ModelMap mmap)
{
SysProcessCategory sysProcessCategory = sysProcessCategoryService.selectSysProcessCategoryById(processCategoryId);
mmap.put("sysProcessCategory", sysProcessCategory);
return prefix + "/edit";
}
/**
* 修改保存制程类别明细
*/
@RequiresPermissions("system:processCategory:edit")
@Log(title = "制程类别明细", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(SysProcessCategory sysProcessCategory)
{
return toAjax(sysProcessCategoryService.updateSysProcessCategory(sysProcessCategory));
}
/**
* 删除制程类别明细
*/
@RequiresPermissions("system:processCategory:remove")
@Log(title = "制程类别明细", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(sysProcessCategoryService.deleteSysProcessCategoryByIds(ids));
}
}

159
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java

@ -0,0 +1,159 @@
package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 制程类别明细对象 sys_process_category
*
* @author ruoyi
* @date 2023-05-22
*/
public class SysProcessCategory extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 制程类别id */
private Long processCategoryId;
/** 制程类别编号 */
@Excel(name = "制程类别编号")
private String processCategoryCode;
/** 制程描述 */
@Excel(name = "制程描述")
private String processDescription;
/** 工时产量 */
@Excel(name = "工时产量")
private String workHourOutput;
/** 标准加工费 */
@Excel(name = "标准加工费")
private String standardConversionCost;
/** 财务实际加工费 */
@Excel(name = "财务实际加工费")
private String actualProcessingCost;
/** 录入时间 */
private String firstAddTime;
/** 修改时间 */
private String updateInfoTime;
/** 备用一 */
private String standbyOne;
/** 备用二 */
private String standbyTwo;
public void setProcessCategoryId(Long processCategoryId)
{
this.processCategoryId = processCategoryId;
}
public Long getProcessCategoryId()
{
return processCategoryId;
}
public void setProcessCategoryCode(String processCategoryCode)
{
this.processCategoryCode = processCategoryCode;
}
public String getProcessCategoryCode()
{
return processCategoryCode;
}
public void setProcessDescription(String processDescription)
{
this.processDescription = processDescription;
}
public String getProcessDescription()
{
return processDescription;
}
public void setWorkHourOutput(String workHourOutput)
{
this.workHourOutput = workHourOutput;
}
public String getWorkHourOutput()
{
return workHourOutput;
}
public void setStandardConversionCost(String standardConversionCost)
{
this.standardConversionCost = standardConversionCost;
}
public String getStandardConversionCost()
{
return standardConversionCost;
}
public void setActualProcessingCost(String actualProcessingCost)
{
this.actualProcessingCost = actualProcessingCost;
}
public String getActualProcessingCost()
{
return actualProcessingCost;
}
public void setFirstAddTime(String firstAddTime)
{
this.firstAddTime = firstAddTime;
}
public String getFirstAddTime()
{
return firstAddTime;
}
public void setUpdateInfoTime(String updateInfoTime)
{
this.updateInfoTime = updateInfoTime;
}
public String getUpdateInfoTime()
{
return updateInfoTime;
}
public void setStandbyOne(String standbyOne)
{
this.standbyOne = standbyOne;
}
public String getStandbyOne()
{
return standbyOne;
}
public void setStandbyTwo(String standbyTwo)
{
this.standbyTwo = standbyTwo;
}
public String getStandbyTwo()
{
return standbyTwo;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("processCategoryId", getProcessCategoryId())
.append("processCategoryCode", getProcessCategoryCode())
.append("processDescription", getProcessDescription())
.append("workHourOutput", getWorkHourOutput())
.append("standardConversionCost", getStandardConversionCost())
.append("actualProcessingCost", getActualProcessingCost())
.append("firstAddTime", getFirstAddTime())
.append("updateInfoTime", getUpdateInfoTime())
.append("standbyOne", getStandbyOne())
.append("standbyTwo", getStandbyTwo())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java

@ -0,0 +1,61 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysProcessCategory;
/**
* 制程类别明细Mapper接口
*
* @author ruoyi
* @date 2023-05-22
*/
public interface SysProcessCategoryMapper
{
/**
* 查询制程类别明细
*
* @param processCategoryId 制程类别明细ID
* @return 制程类别明细
*/
public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId);
/**
* 查询制程类别明细列表
*
* @param sysProcessCategory 制程类别明细
* @return 制程类别明细集合
*/
public List<SysProcessCategory> selectSysProcessCategoryList(SysProcessCategory sysProcessCategory);
/**
* 新增制程类别明细
*
* @param sysProcessCategory 制程类别明细
* @return 结果
*/
public int insertSysProcessCategory(SysProcessCategory sysProcessCategory);
/**
* 修改制程类别明细
*
* @param sysProcessCategory 制程类别明细
* @return 结果
*/
public int updateSysProcessCategory(SysProcessCategory sysProcessCategory);
/**
* 删除制程类别明细
*
* @param processCategoryId 制程类别明细ID
* @return 结果
*/
public int deleteSysProcessCategoryById(Long processCategoryId);
/**
* 批量删除制程类别明细
*
* @param processCategoryIds 需要删除的数据ID
* @return 结果
*/
public int deleteSysProcessCategoryByIds(String[] processCategoryIds);
}

61
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java

@ -0,0 +1,61 @@
package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.SysProcessCategory;
/**
* 制程类别明细Service接口
*
* @author ruoyi
* @date 2023-05-22
*/
public interface ISysProcessCategoryService
{
/**
* 查询制程类别明细
*
* @param processCategoryId 制程类别明细ID
* @return 制程类别明细
*/
public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId);
/**
* 查询制程类别明细列表
*
* @param sysProcessCategory 制程类别明细
* @return 制程类别明细集合
*/
public List<SysProcessCategory> selectSysProcessCategoryList(SysProcessCategory sysProcessCategory);
/**
* 新增制程类别明细
*
* @param sysProcessCategory 制程类别明细
* @return 结果
*/
public int insertSysProcessCategory(SysProcessCategory sysProcessCategory);
/**
* 修改制程类别明细
*
* @param sysProcessCategory 制程类别明细
* @return 结果
*/
public int updateSysProcessCategory(SysProcessCategory sysProcessCategory);
/**
* 批量删除制程类别明细
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteSysProcessCategoryByIds(String ids);
/**
* 删除制程类别明细信息
*
* @param processCategoryId 制程类别明细ID
* @return 结果
*/
public int deleteSysProcessCategoryById(Long processCategoryId);
}

94
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java

@ -0,0 +1,94 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.SysProcessCategoryMapper;
import com.ruoyi.system.domain.SysProcessCategory;
import com.ruoyi.system.service.ISysProcessCategoryService;
import com.ruoyi.common.core.text.Convert;
/**
* 制程类别明细Service业务层处理
*
* @author ruoyi
* @date 2023-05-22
*/
@Service
public class SysProcessCategoryServiceImpl implements ISysProcessCategoryService
{
@Autowired
private SysProcessCategoryMapper sysProcessCategoryMapper;
/**
* 查询制程类别明细
*
* @param processCategoryId 制程类别明细ID
* @return 制程类别明细
*/
@Override
public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId)
{
return sysProcessCategoryMapper.selectSysProcessCategoryById(processCategoryId);
}
/**
* 查询制程类别明细列表
*
* @param sysProcessCategory 制程类别明细
* @return 制程类别明细
*/
@Override
public List<SysProcessCategory> selectSysProcessCategoryList(SysProcessCategory sysProcessCategory)
{
return sysProcessCategoryMapper.selectSysProcessCategoryList(sysProcessCategory);
}
/**
* 新增制程类别明细
*
* @param sysProcessCategory 制程类别明细
* @return 结果
*/
@Override
public int insertSysProcessCategory(SysProcessCategory sysProcessCategory)
{
return sysProcessCategoryMapper.insertSysProcessCategory(sysProcessCategory);
}
/**
* 修改制程类别明细
*
* @param sysProcessCategory 制程类别明细
* @return 结果
*/
@Override
public int updateSysProcessCategory(SysProcessCategory sysProcessCategory)
{
return sysProcessCategoryMapper.updateSysProcessCategory(sysProcessCategory);
}
/**
* 删除制程类别明细对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteSysProcessCategoryByIds(String ids)
{
return sysProcessCategoryMapper.deleteSysProcessCategoryByIds(Convert.toStrArray(ids));
}
/**
* 删除制程类别明细信息
*
* @param processCategoryId 制程类别明细ID
* @return 结果
*/
@Override
public int deleteSysProcessCategoryById(Long processCategoryId)
{
return sysProcessCategoryMapper.deleteSysProcessCategoryById(processCategoryId);
}
}

87
ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysProcessCategoryMapper">
<resultMap type="SysProcessCategory" id="SysProcessCategoryResult">
<result property="processCategoryId" column="process_category_id" />
<result property="processCategoryCode" column="process_category_code" />
<result property="processDescription" column="process_description" />
<result property="workHourOutput" column="work_hour_output" />
<result property="standardConversionCost" column="standard_conversion_cost" />
<result property="actualProcessingCost" column="actual_processing_cost" />
<result property="firstAddTime" column="first_add_time" />
<result property="updateInfoTime" column="update_info_time" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
</resultMap>
<sql id="selectSysProcessCategoryVo">
select process_category_id, process_category_code, process_description, work_hour_output, standard_conversion_cost, actual_processing_cost, first_add_time, update_info_time, standby_one, standby_two from sys_process_category
</sql>
<select id="selectSysProcessCategoryList" parameterType="SysProcessCategory" resultMap="SysProcessCategoryResult">
<include refid="selectSysProcessCategoryVo"/>
<where>
<if test="processCategoryCode != null and processCategoryCode != ''"> and process_category_code like concat('%', #{processCategoryCode}, '%')</if>
<if test="processDescription != null and processDescription != ''"> and process_description like concat('%', #{processDescription}, '%')</if>
</where>
</select>
<select id="selectSysProcessCategoryById" parameterType="Long" resultMap="SysProcessCategoryResult">
<include refid="selectSysProcessCategoryVo"/>
where process_category_id = #{processCategoryId}
</select>
<insert id="insertSysProcessCategory" parameterType="SysProcessCategory" useGeneratedKeys="true" keyProperty="processCategoryId">
insert into sys_process_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="processCategoryCode != null">process_category_code,</if>
<if test="processDescription != null">process_description,</if>
<if test="workHourOutput != null">work_hour_output,</if>
<if test="standardConversionCost != null">standard_conversion_cost,</if>
<if test="actualProcessingCost != null">actual_processing_cost,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="processCategoryCode != null">#{processCategoryCode},</if>
<if test="processDescription != null">#{processDescription},</if>
<if test="workHourOutput != null">#{workHourOutput},</if>
<if test="standardConversionCost != null">#{standardConversionCost},</if>
<if test="actualProcessingCost != null">#{actualProcessingCost},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
NOW(),
</trim>
</insert>
<update id="updateSysProcessCategory" parameterType="SysProcessCategory">
update sys_process_category
<trim prefix="SET" suffixOverrides=",">
<if test="processCategoryCode != null">process_category_code = #{processCategoryCode},</if>
<if test="processDescription != null">process_description = #{processDescription},</if>
<if test="workHourOutput != null">work_hour_output = #{workHourOutput},</if>
<if test="standardConversionCost != null">standard_conversion_cost = #{standardConversionCost},</if>
<if test="actualProcessingCost != null">actual_processing_cost = #{actualProcessingCost},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
</trim>
where process_category_id = #{processCategoryId}
</update>
<delete id="deleteSysProcessCategoryById" parameterType="Long">
delete from sys_process_category where process_category_id = #{processCategoryId}
</delete>
<delete id="deleteSysProcessCategoryByIds" parameterType="String">
delete from sys_process_category where process_category_id in
<foreach item="processCategoryId" collection="array" open="(" separator="," close=")">
#{processCategoryId}
</foreach>
</delete>
</mapper>

55
ruoyi-admin/src/main/resources/templates/system/processCategory/add.html

@ -0,0 +1,55 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增制程类别明细')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-processCategory-add">
<div class="form-group">
<label class="col-sm-3 control-label">制程类别编号:</label>
<div class="col-sm-8">
<input name="processCategoryCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">制程描述:</label>
<div class="col-sm-8">
<textarea name="processDescription" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工时产量:</label>
<div class="col-sm-8">
<input name="workHourOutput" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">标准加工费:</label>
<div class="col-sm-8">
<input name="standardConversionCost" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">财务实际加工费:</label>
<div class="col-sm-8">
<input name="actualProcessingCost" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/processCategory"
$("#form-processCategory-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-processCategory-add').serialize());
}
}
</script>
</body>
</html>

56
ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改制程类别明细')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-processCategory-edit" th:object="${sysProcessCategory}">
<input name="processCategoryId" th:field="*{processCategoryId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">制程类别编号:</label>
<div class="col-sm-8">
<input name="processCategoryCode" th:field="*{processCategoryCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">制程描述:</label>
<div class="col-sm-8">
<textarea name="processDescription" class="form-control">[[*{processDescription}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工时产量:</label>
<div class="col-sm-8">
<input name="workHourOutput" th:field="*{workHourOutput}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">标准加工费:</label>
<div class="col-sm-8">
<input name="standardConversionCost" th:field="*{standardConversionCost}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">财务实际加工费:</label>
<div class="col-sm-8">
<input name="actualProcessingCost" th:field="*{actualProcessingCost}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/processCategory";
$("#form-processCategory-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-processCategory-edit').serialize());
}
}
</script>
</body>
</html>

119
ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html

@ -0,0 +1,119 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('制程类别明细列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>制程类别编号:</label>
<input type="text" name="processCategoryCode"/>
</li>
<li>
<label>制程描述:</label>
<input type="text" name="processDescription"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:processCategory:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:processCategory:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:processCategory:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:processCategory:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:processCategory:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:processCategory:remove')}]];
var prefix = ctx + "system/processCategory";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "制程类别明细",
columns: [{
checkbox: true
},
{
field: 'processCategoryId',
title: '制程类别id',
visible: false
},
{
field: 'processCategoryCode',
title: '制程类别编号'
},
{
field: 'processDescription',
title: '制程描述'
},
{
field: 'workHourOutput',
title: '工时产量'
},
{
field: 'standardConversionCost',
title: '标准加工费'
},
{
field: 'actualProcessingCost',
title: '财务实际加工费'
},
{
field: 'firstAddTime',
title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

BIN
ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysCaptchaController.class

Binary file not shown.

3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@ -31,9 +31,6 @@ public class SysDept extends BaseEntity
/** 部门名称 */ /** 部门名称 */
private String deptName; private String deptName;
/** 部门编号*/
private String deptNumber;
/** 显示顺序 */ /** 显示顺序 */
private String orderNum; private String orderNum;

Loading…
Cancel
Save